summaryrefslogtreecommitdiff
path: root/src/server-tests
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-05 21:14:13 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-12 14:59:05 +0300
commitf28c6af4846a3fa31e80ddf218acf433290930b0 (patch)
tree9b71a6fb6d5db2a00070f4919e0ea4aa9d76dc94 /src/server-tests
parentfecd18c77b8b991f7cb9e1eda052c78f5a419d0d (diff)
rename: config -> rz_config
Diffstat (limited to 'src/server-tests')
-rw-r--r--src/server-tests/test_db_controller.py4
-rw-r--r--src/server-tests/test_neo4j_cypher.py4
-rw-r--r--src/server-tests/test_rhizi_api.py4
-rw-r--r--src/server-tests/test_rzdoc.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index 89503e1a..27275f08 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -21,7 +21,7 @@ from neo4j_test_util import DBO_random_data_generation
import neo4j_test_util
from neo4j_util import Neo4JException
from neo4j_util import meta_attr_list_to_meta_attr_map
-from rz_config import Config
+from rz_config import RZ_Config
from test_util import generate_random_link_dict
from test_util import generate_random_node_dict
from test_util__pydev import debug__pydev_pd_arg
@@ -358,7 +358,7 @@ class TestDBController(unittest.TestCase):
self.assertTrue(0 < len(l_set))
def test_rzdb__init_DB(self):
- rz_cfg = Config.generate_default()
+ rz_cfg = RZ_Config.generate_default()
op = DBO_rzdb__init_DB(rz_cfg.rzdoc__mainpage_name)
try: # assert first init call passes
self.db_ctl.exec_op(op)
diff --git a/src/server-tests/test_neo4j_cypher.py b/src/server-tests/test_neo4j_cypher.py
index 49f5f224..1c4daae8 100644
--- a/src/server-tests/test_neo4j_cypher.py
+++ b/src/server-tests/test_neo4j_cypher.py
@@ -11,7 +11,7 @@ from neo4j_cypher import Cypher_Parser, DB_Query
from neo4j_qt import QT_RZDOC_NS_Filter
import neo4j_test_util
from neo4j_util import meta_attr_list_to_meta_attr_map
-from rz_config import Config
+from rz_config import RZ_Config
from rz_server import init_log
from test_util import generate_random_node_dict, generate_random_link_dict, \
generate_random_RZDoc
@@ -22,7 +22,7 @@ class Test_DB_Op(unittest.TestCase):
@classmethod
def setUpClass(self):
- cfg = Config.init_from_file('res/etc/rhizi-server.conf')
+ cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf')
self.log = init_log(cfg)
def setUp(self):
diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py
index 694f8d32..67a67220 100644
--- a/src/server-tests/test_rhizi_api.py
+++ b/src/server-tests/test_rhizi_api.py
@@ -7,7 +7,7 @@ from werkzeug.test import EnvironBuilder
import db_controller as dbc
from db_op import DBO_cypher_query
import rz_api
-from rz_config import Config
+from rz_config import RZ_Config
from test_util__pydev import debug__pydev_pd_arg
@@ -18,7 +18,7 @@ class TestRhiziAPI(unittest.TestCase):
@classmethod
def setUpClass(self):
- cfg = Config.init_from_file('res/etc/rhizi-server.conf')
+ cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf')
self.db_ctl = dbc.DB_Controller(cfg.db_base_url)
rz_api.db_ctl = self.db_ctl
diff --git a/src/server-tests/test_rzdoc.py b/src/server-tests/test_rzdoc.py
index d9c7cefa..a9c61873 100644
--- a/src/server-tests/test_rzdoc.py
+++ b/src/server-tests/test_rzdoc.py
@@ -3,7 +3,7 @@ import unittest
import db_controller
import neo4j_test_util
-from rz_config import Config
+from rz_config import RZ_Config
from rz_kernel import RZ_Kernel
import test_util
from test_util__pydev import debug__pydev_pd_arg
@@ -13,7 +13,7 @@ class TestRZDoc(unittest.TestCase):
@classmethod
def setUpClass(self):
- cfg = Config.init_from_file('res/etc/rhizi-server.conf')
+ cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf')
self.db_ctl = db_controller.DB_Controller(cfg.db_base_url)
self.log = logging.getLogger('rhizi')
self.log.addHandler(logging.StreamHandler())