From ea550cfb3670d5925144ad55f260d7f8fb5f4bfe Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 12 May 2015 11:23:23 +0300 Subject: test_util: host gen_random_name() --- src/server-tests/neo4j_test_util.py | 7 ------- src/server-tests/test_util.py | 6 ++++++ 2 files changed, 6 insertions(+), 7 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 74e6db44..9d6700fb 100644 --- a/src/server-tests/neo4j_test_util.py +++ b/src/server-tests/neo4j_test_util.py @@ -1,5 +1,4 @@ from random import choice -import random import string import uuid @@ -54,12 +53,6 @@ class DBO_random_data_generation(DB_op): def link_set_label(self): return self.r_label -def gen_random_name(size=8, char_set=string.ascii_uppercase + string.digits): - """ - used for random node generation - """ - return ''.join(random.choice(char_set) for _ in range(size)) - def rand_label(prefix='T_', length=8): """ return a prefixed random label, where the default prefix is 'T_' diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py index 4484ec2f..aa363948 100644 --- a/src/server-tests/test_util.py +++ b/src/server-tests/test_util.py @@ -30,6 +30,12 @@ def init_test_ws_server(cfg, db_ctl): ws_srv = init_ws_interface(cfg, webapp) return ws_srv +def gen_random_name(size=8, char_set=string.ascii_uppercase + string.digits): + """ + used for random node generation + """ + return ''.join(random.choice(char_set) for _ in range(size)) + def generate_random_node_dict(n_type, nid=None): """ @param n_type: is converted to a label set -- cgit v1.3.1