diff options
| author | Boris Ranto <branto@redhat.com> | 2017-05-25 14:36:13 +0200 |
|---|---|---|
| committer | Boris Ranto <branto@redhat.com> | 2017-05-31 01:35:12 +0200 |
| commit | 077038b4393a28ccbd38ca4a90105dbd4c1ffcd5 (patch) | |
| tree | 39832c48c8ff0c3be00e99644cdb6e25e9797e7e /src/ceph-disk/tests/test_main.py | |
| parent | selinux: Do parallel relabel on package install (diff) | |
| download | ceph-077038b4393a28ccbd38ca4a90105dbd4c1ffcd5.tar.xz ceph-077038b4393a28ccbd38ca4a90105dbd4c1ffcd5.zip | |
ceph-disk: Fix the file ownership, skip missing
This commit fixes the file ownership for the /usr/bin/ and /etc/ceph
files and skips missing files as some of the files that we do specify
now can be missing from the system (not installed, e.f. radosgw).
Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | src/ceph-disk/tests/test_main.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ceph-disk/tests/test_main.py b/src/ceph-disk/tests/test_main.py index 45fe48a1690..8c3e08451fd 100644 --- a/src/ceph-disk/tests/test_main.py +++ b/src/ceph-disk/tests/test_main.py @@ -1328,11 +1328,19 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase): commands.append(" ".join(x)) return ("", "", None) + class Os(object): + F_OK = 0 + + @staticmethod + def access(x, y): + return True + with patch.multiple( main, command=_command, command_init=lambda x: commands.append(x), command_wait=lambda x: None, + os=Os, ): main.main_fix(args) commands = " ".join(commands) |