summaryrefslogtreecommitdiff
path: root/src/server-tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/server-tests')
-rw-r--r--src/server-tests/test_rz_mesh.py4
-rw-r--r--src/server-tests/test_util.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server-tests/test_rz_mesh.py b/src/server-tests/test_rz_mesh.py
index 511db831..b6743628 100644
--- a/src/server-tests/test_rz_mesh.py
+++ b/src/server-tests/test_rz_mesh.py
@@ -8,7 +8,7 @@ import urllib2
from model.graph import Attr_Diff
from model.graph import Topo_Diff
import neo4j_test_util
-from neo4j_util import rand_id
+from neo4j_util import generate_random_id__uuid
from rz_api_websocket import WebSocket_Graph_NS
import test_util
@@ -44,7 +44,7 @@ class TestMeshAPI(unittest.TestCase):
def _emit_tx_topo_diff(self):
with TestMeshAPI.rz_socket() as (_, ns_sock):
- n_set = [{'__label_set': ['xxx'], 'id': rand_id() }]
+ n_set = [{'__label_set': ['xxx'], 'id': generate_random_id__uuid() }]
topo_diff = Topo_Diff(node_set_add=n_set)
data = json.dumps(topo_diff, cls=Topo_Diff.JSON_Encoder)
ns_sock.emit('diff_commit__topo', data)
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py
index c1ed2558..594d0cbd 100644
--- a/src/server-tests/test_util.py
+++ b/src/server-tests/test_util.py
@@ -4,7 +4,7 @@ Various test utilities
import db_controller as dbc
from model.model import Link
from neo4j_test_util import gen_random_name
-from neo4j_util import rand_id
+from neo4j_util import generate_random_id__uuid
from rz_kernel import RZ_Kernel
from rz_mesh import init_ws_interface
from rz_server import init_webapp
@@ -32,7 +32,7 @@ def generate_random_node_dict(n_type, nid=None):
@return: a dict based node object representation and the generated node id
"""
if None == nid:
- nid = rand_id()
+ nid = generate_random_id__uuid()
return {'__label_set': [n_type],
'id': nid,
@@ -45,7 +45,7 @@ def generate_random_link_dict(l_type, src_id, dst_id, lid=None):
@return: a dict based node object representation and the generated node id
"""
if None == lid:
- lid = rand_id()
+ lid = generate_random_id__uuid()
ret_dict = Link.link_ptr(src_id, dst_id)
ret_dict['__type'] = [l_type]