summaryrefslogtreecommitdiff
path: root/src/server-tests
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-05 00:03:17 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-05 19:28:09 +0300
commitb369bde45d958ae77f874a73b9866f3a511ed344 (patch)
tree47bbfd7a2277c6da0a8fcb5f12cf502423906556 /src/server-tests
parent467e5a4deea0108ebfd656bdbb91db98f2bdd632 (diff)
DB_Controller: refactor rz_config dep -> rz_config.rest_api_base_url
Diffstat (limited to 'src/server-tests')
-rw-r--r--src/server-tests/test_db_controller.py2
-rw-r--r--src/server-tests/test_rhizi_api.py2
-rw-r--r--src/server-tests/test_rzdoc.py2
-rw-r--r--src/server-tests/test_util.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index 19c08f77..9c47e6bc 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -47,7 +47,7 @@ class TestDBController(unittest.TestCase):
@classmethod
def setUpClass(self):
cfg = Config.init_from_file('res/etc/rhizi-server.conf')
- self.db_ctl = dbc.DB_Controller(cfg)
+ self.db_ctl = dbc.DB_Controller(cfg.db_base_url)
self.log = logging.getLogger('rhizi')
self.log.addHandler(logging.StreamHandler())
diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py
index a010522b..4665205b 100644
--- a/src/server-tests/test_rhizi_api.py
+++ b/src/server-tests/test_rhizi_api.py
@@ -21,7 +21,7 @@ class TestRhiziAPI(unittest.TestCase):
@classmethod
def setUpClass(self):
cfg = Config.init_from_file('res/etc/rhizi-server.conf')
- self.db_ctl = dbc.DB_Controller(cfg)
+ self.db_ctl = dbc.DB_Controller(cfg.db_base_url)
rz_api.db_ctl = self.db_ctl
# TODO extract to superclass
diff --git a/src/server-tests/test_rzdoc.py b/src/server-tests/test_rzdoc.py
index 01e15400..9235beae 100644
--- a/src/server-tests/test_rzdoc.py
+++ b/src/server-tests/test_rzdoc.py
@@ -13,7 +13,7 @@ class TestRZDoc(unittest.TestCase):
@classmethod
def setUpClass(self):
cfg = Config.init_from_file('res/etc/rhizi-server.conf')
- self.db_ctl = db_controller.DB_Controller(cfg)
+ self.db_ctl = db_controller.DB_Controller(cfg.db_base_url)
self.log = logging.getLogger('rhizi')
self.log.addHandler(logging.StreamHandler())
self.kernel = RZ_Kernel()
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py
index 8129b566..4484ec2f 100644
--- a/src/server-tests/test_util.py
+++ b/src/server-tests/test_util.py
@@ -16,7 +16,7 @@ import test_rz_mesh
def init_test_db_controller(cfg):
- ret = dbc.DB_Controller(cfg)
+ ret = dbc.DB_Controller(cfg.db_base_url)
return ret
def init_test_ws_server(cfg, db_ctl):