diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-28 19:03:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-28 19:03:42 +0000 |
| commit | 5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe (patch) | |
| tree | 4ce3ab6983eb101fba5fc4eb9dfdfbf959d5846e /tests | |
| parent | 2cfc25e53a8bb6cb21bee24051c65d36015c6c09 (diff) | |
| parent | c5320eb22386c34d83435fa0b9aa03b178996b52 (diff) | |
| download | kolla-5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe.tar.gz kolla-5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe.zip | |
Merge "Fix kolla_set_configs --check with a directory"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_set_config.py | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/tests/test_set_config.py b/tests/test_set_config.py index 8af2e618d..3888a38cc 100644 --- a/tests/test_set_config.py +++ b/tests/test_set_config.py @@ -288,3 +288,44 @@ class ConfigFileTest(base.BaseTestCase): '/foo/bar.conf'), mock.call('/var/lib/kolla/config_files/bar.yml', '/foo/bar.yml')]) + + @mock.patch.object(set_configs.ConfigFile, '_cmp_file') + @mock.patch.object(set_configs.ConfigFile, '_cmp_dir') + @mock.patch('os.path.isdir', return_value=False) + @mock.patch('glob.glob') + def test_check_source_dir(self, mock_glob, mock_isdir, mock_cmp_dir, + mock_cmp_file): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644') + + mock_glob.return_value = ['/var/lib/kolla/config_files/bar'] + mock_isdir.return_value = True + mock_cmp_dir.return_value = True + + config_file.check() + + mock_isdir.assert_called_once_with('/var/lib/kolla/config_files/bar') + mock_cmp_dir.assert_called_once_with( + '/var/lib/kolla/config_files/bar', '/foo') + mock_cmp_file.assert_not_called() + + @mock.patch.object(set_configs.ConfigFile, '_cmp_file') + @mock.patch.object(set_configs.ConfigFile, '_cmp_dir') + @mock.patch('os.path.isdir', return_value=False) + @mock.patch('glob.glob') + def test_check_source_dir_no_equal(self, mock_glob, mock_isdir, + mock_cmp_dir, mock_cmp_file): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644') + + mock_glob.return_value = ['/var/lib/kolla/config_files/bar'] + mock_isdir.return_value = True + mock_cmp_dir.return_value = False + + self.assertRaises(set_configs.ConfigFileBadState, + config_file.check) + + mock_isdir.assert_called_once_with('/var/lib/kolla/config_files/bar') + mock_cmp_dir.assert_called_once_with( + '/var/lib/kolla/config_files/bar', '/foo') + mock_cmp_file.assert_not_called() |