diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-28 19:39:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-28 19:39:46 +0000 |
| commit | a238fb5d3ec66b2275bcfe54a7687ec1e29ce36d (patch) | |
| tree | 33c0d1b9bacebc82a6967f2365001f4ce5a5d681 /tests/test_set_config.py | |
| parent | ac12632ead6dad3293e964f2597362444062c47e (diff) | |
| parent | 72ac7a5541e510cadfec0dc6754c5cf52503b187 (diff) | |
| download | kolla-a238fb5d3ec66b2275bcfe54a7687ec1e29ce36d.tar.gz kolla-a238fb5d3ec66b2275bcfe54a7687ec1e29ce36d.zip | |
Merge "Reconfigure keystone service"
Diffstat (limited to 'tests/test_set_config.py')
| -rw-r--r-- | tests/test_set_config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_set_config.py b/tests/test_set_config.py index 43884bdb3..03975d156 100644 --- a/tests/test_set_config.py +++ b/tests/test_set_config.py @@ -38,7 +38,8 @@ class LoadFromFile(base.BaseTestCase): mo = mock.mock_open(read_data=in_config) with mock.patch.object(set_configs, 'open', mo): - set_configs.load_config() + config = set_configs.load_config() + set_configs.copy_config(config) self.assertEqual([ mock.call('/var/lib/kolla/config_files/config.json'), mock.call().__enter__(), @@ -59,7 +60,8 @@ class LoadFromEnv(base.BaseTestCase): mo = mock.mock_open() with mock.patch.object(set_configs, 'open', mo): with mock.patch.dict('os.environ', {'KOLLA_CONFIG': in_config}): - set_configs.load_config() + config = set_configs.load_config() + set_configs.copy_config(config) self.assertEqual([mock.call('/run_command', 'w+'), mock.call().__enter__(), mock.call().write(u'/bin/true'), |