From b369bde45d958ae77f874a73b9866f3a511ed344 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 5 May 2015 00:03:17 +0300 Subject: DB_Controller: refactor rz_config dep -> rz_config.rest_api_base_url --- src/server-tests/test_db_controller.py | 2 +- src/server-tests/test_rhizi_api.py | 2 +- src/server-tests/test_rzdoc.py | 2 +- src/server-tests/test_util.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server-tests') 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): -- cgit v1.3.1