diff --git a/cue/tests/functional/base.py b/cue/tests/functional/base.py index 4fa6224a..b8ad2942 100644 --- a/cue/tests/functional/base.py +++ b/cue/tests/functional/base.py @@ -52,8 +52,8 @@ class FunctionalTestCase(base.BaseTestCase): """Test case base class for all functional tests.""" additional_fixtures = [] - #todo(dagnello): add enable_fixures as a configurable parameters for - #running tests. + # todo(dagnello): add enable_fixures as a configurable parameters for + # running tests. enable_fixtures = True def setUp(self): @@ -131,7 +131,7 @@ class FunctionalTestCase(base.BaseTestCase): def flags(self, group=None, **kw): """Override flag variables for a test.""" for k, v in six.iteritems(kw): - CONF.set_override(k, v, group, enforce_type=True) + CONF.set_override(k, v, group) def path_get(self, project_file=None): """Get the absolute path to a file. Used for testing the API. diff --git a/cue/tests/functional/db/manage/database/test_migration.py b/cue/tests/functional/db/manage/database/test_migration.py index 7d514ab3..57516e9e 100644 --- a/cue/tests/functional/db/manage/database/test_migration.py +++ b/cue/tests/functional/db/manage/database/test_migration.py @@ -40,8 +40,7 @@ class MigrationFunctionalTests(base.BaseTestCase): self.config = self.config_fixture.config self.config_fixture.register_opt(cfg.StrOpt( 'connection', default='sqlite://')) - conf.set_override('connection', 'sqlite://', 'database', - enforce_type=True) + conf.set_override('connection', 'sqlite://', 'database') self.cmd = database.DatabaseCommands() diff --git a/cue/tests/functional/monitor/test_monitor.py b/cue/tests/functional/monitor/test_monitor.py index e1825ce0..2f094c79 100644 --- a/cue/tests/functional/monitor/test_monitor.py +++ b/cue/tests/functional/monitor/test_monitor.py @@ -37,12 +37,9 @@ class MonitorFunctionalTests(base.FunctionalTestCase): def setUp(self): super(MonitorFunctionalTests, self).setUp() - CONF.set_override("coord_url", "zake", group="taskflow", - enforce_type=True) - CONF.set_override("zk_hosts", "", group="taskflow", - enforce_type=True) - CONF.set_override("zk_port", "", group="taskflow", - enforce_type=True) + CONF.set_override("coord_url", "zake", group="taskflow") + CONF.set_override("zk_hosts", "", group="taskflow") + CONF.set_override("zk_port", "", group="taskflow") self.active_cluster_id = uuid.uuid4() self.error_cluster_id = uuid.uuid4() diff --git a/cue/tests/unit/manage/database/test_migration.py b/cue/tests/unit/manage/database/test_migration.py index e9ddd8d8..cb9290ff 100644 --- a/cue/tests/unit/manage/database/test_migration.py +++ b/cue/tests/unit/manage/database/test_migration.py @@ -33,8 +33,7 @@ class TestMigration(oslo_base.BaseTestCase): def setUp(self): super(TestMigration, self).setUp() - CONF.set_override("connection", "sqlite://", group="database", - enforce_type=True) + CONF.set_override("connection", "sqlite://", group="database") self.cue_manage_database = cue_db.DatabaseCommands() @mock.patch('oslo_db.sqlalchemy.migration_cli.manager.' diff --git a/cue/tests/unit/monitor/test_monitor.py b/cue/tests/unit/monitor/test_monitor.py index 50f546f8..dbcd2b97 100644 --- a/cue/tests/unit/monitor/test_monitor.py +++ b/cue/tests/unit/monitor/test_monitor.py @@ -33,12 +33,9 @@ class TestMonitorService(oslo_base.BaseTestCase): def setUp(self): super(TestMonitorService, self).setUp() - CONF.set_override("coord_url", "zake", group="taskflow", - enforce_type=True) - CONF.set_override("zk_hosts", "", group="taskflow", - enforce_type=True) - CONF.set_override("zk_port", "", group="taskflow", - enforce_type=True) + CONF.set_override("coord_url", "zake", group="taskflow") + CONF.set_override("zk_hosts", "", group="taskflow") + CONF.set_override("zk_port", "", group="taskflow") self.cue_monitor_service = cue_monitor_service.MonitorService() @@ -48,8 +45,7 @@ class TestMonitorService(oslo_base.BaseTestCase): mock_fixed_interval_loop_call_start, mock_loop_call_wait): CONF.set_override("loop_interval_seconds", "9001", - group="cue_monitor", - enforce_type=True) + group="cue_monitor") self.cue_monitor_service.start()