diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-04 10:30:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-04 10:30:48 +0000 |
| commit | b986d4e8a48860a1201746f8bdad8f120e2a93f1 (patch) | |
| tree | 746549e9983b01cd5af79c89d0af7ef4cacf3f4f | |
| parent | cfa745a47d27ef7ef308dc05e4b39235365483dd (diff) | |
| parent | ea3d140cab23ce3016e3bea7d35e4f5fbb8611f6 (diff) | |
| download | kolla-b986d4e8a48860a1201746f8bdad8f120e2a93f1.tar.gz kolla-b986d4e8a48860a1201746f8bdad8f120e2a93f1.zip | |
Merge "Fix argument to handle_permissions"
| -rw-r--r-- | docker/base/set_configs.py | 5 | ||||
| -rw-r--r-- | tests/test_set_config.py | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 229090817..e2005c5f7 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -121,8 +121,9 @@ class ConfigFile(object): os.chown(dest, stat.st_uid, stat.st_gid) def _set_properties_from_conf(self, path): - handle_permissions({'owner': self.owner, 'path': path, - 'perm': self.perm}) + config = {'permissions': + [{'owner': self.owner, 'path': path, 'perm': self.perm}]} + handle_permissions(config) def copy(self): diff --git a/tests/test_set_config.py b/tests/test_set_config.py index aff97b3bb..643b5ba54 100644 --- a/tests/test_set_config.py +++ b/tests/test_set_config.py @@ -143,9 +143,10 @@ class ConfigFileTest(base.BaseTestCase): config_file = copy.deepcopy(FAKE_CONFIG_FILE) config_file._set_properties_from_conf(config_file.dest) - mock_handle_permissions.assert_called_with({'owner': 'user1', - 'path': config_file.dest, - 'perm': '0644'}) + mock_handle_permissions.assert_called_with({'permissions': + [{'owner': 'user1', + 'path': config_file.dest, + 'perm': '0644'}]}) @mock.patch('glob.glob', return_value=[]) def test_copy_no_source_not_optional(self, |