From 1ccae3497a7a013e2f94ce921017e5fa9e9d233f Mon Sep 17 00:00:00 2001 From: LV-426 Date: Sun, 18 Jan 2015 22:09:03 +0200 Subject: mv rand_id() -> neo4j_util.py --- src/server-tests/neo4j_test_util.py | 3 --- src/server-tests/test_db_controller.py | 1 - src/server-tests/test_rz_mesh.py | 2 +- src/server-tests/test_util.py | 3 ++- 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/server-tests') diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py index 6272af01..8f63a1a5 100644 --- a/src/server-tests/neo4j_test_util.py +++ b/src/server-tests/neo4j_test_util.py @@ -42,9 +42,6 @@ class DBO_random_data_generation(DB_op): def link_set_label(self): return self.r_label -def rand_id(): - return str(uuid.uuid4()) - def gen_random_name(size=8, char_set=string.ascii_uppercase + string.digits): """ used for random node generation diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py index 4b11559f..987abedb 100644 --- a/src/server-tests/test_db_controller.py +++ b/src/server-tests/test_db_controller.py @@ -21,7 +21,6 @@ from model.graph import Topo_Diff from model.model import Link from neo4j_test_util import DBO_random_data_generation from neo4j_test_util import flush_db -from neo4j_test_util import rand_id import neo4j_test_util from neo4j_util import Neo4JException, DB_Query from neo4j_util import meta_attr_list_to_meta_attr_map diff --git a/src/server-tests/test_rz_mesh.py b/src/server-tests/test_rz_mesh.py index 14c53758..511db831 100644 --- a/src/server-tests/test_rz_mesh.py +++ b/src/server-tests/test_rz_mesh.py @@ -7,8 +7,8 @@ import urllib2 from model.graph import Attr_Diff from model.graph import Topo_Diff -from neo4j_test_util import rand_id import neo4j_test_util +from neo4j_util import rand_id from rz_api_websocket import WebSocket_Graph_NS import test_util diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py index e57a065f..c1ed2558 100644 --- a/src/server-tests/test_util.py +++ b/src/server-tests/test_util.py @@ -3,7 +3,8 @@ Various test utilities """ import db_controller as dbc from model.model import Link -from neo4j_test_util import rand_id, gen_random_name +from neo4j_test_util import gen_random_name +from neo4j_util import rand_id from rz_kernel import RZ_Kernel from rz_mesh import init_ws_interface from rz_server import init_webapp -- cgit v1.3.1