From d199cedc8fd1d3d76592d06bffd3644f58027ffa Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 9 Jun 2017 14:54:26 +0200 Subject: [PATCH] tests: ceph-disk destroy needs --purge The former semantic of ceph-disk destroy is now implemented with the --purge flag. Use that for the ceph-disk suite. Signed-off-by: Loic Dachary --- qa/workunits/ceph-disk/ceph-disk-test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py index b80e1da897128..5dc4a35138f7f 100644 --- a/qa/workunits/ceph-disk/ceph-disk-test.py +++ b/qa/workunits/ceph-disk/ceph-disk-test.py @@ -22,7 +22,7 @@ # ln -sf /home/ubuntu/ceph/systemd/ceph-disk@.service /usr/lib/systemd/system/ceph-disk@.service # ceph-disk.conf will be silently ignored if it is a symbolic link or a hard link /var/log/upstart for logs # cp /home/ubuntu/ceph/src/upstart/ceph-disk.conf /etc/init/ceph-disk.conf -# id=3 ; ceph-disk deactivate --deactivate-by-id $id ; ceph-disk destroy --zap --destroy-by-id $id +# id=3 ; ceph-disk deactivate --deactivate-by-id $id ; ceph-disk destroy --purge --zap --destroy-by-id $id # py.test -s -v -k test_activate_dmcrypt_luks ceph-disk-test.py # # CentOS 7 @@ -172,7 +172,7 @@ class CephDisk: self.sh(""" set -xe ceph-disk --verbose deactivate --deactivate-by-id {id} - ceph-disk --verbose destroy --destroy-by-id {id} --zap + ceph-disk --verbose destroy --purge --destroy-by-id {id} --zap """.format(id=id)) def deactivate_osd(self, uuid): @@ -298,7 +298,7 @@ class TestCephDisk(object): assert partition['state'] == 'active' c.sh("ceph-disk --verbose deactivate " + partition['path']) c.wait_for_osd_down(osd_uuid) - c.sh("ceph-disk --verbose destroy " + partition['path'] + " --zap") + c.sh("ceph-disk --verbose destroy --purge " + partition['path'] + " --zap") def test_deactivate_reactivate_dmcrypt_plain(self): c = CephDisk() -- 2.39.5