Переглянути джерело

tests: fix cleanup after reflink tests

First make the directory accessible again, otherwise os.path.ismount may
not detect it (so umount would not be called) and then rmdir will fail.
Marek Marczykowski-Górecki 5 роки тому
батько
коміт
4234fe5112
1 змінених файлів з 2 додано та 2 видалено
  1. 2 2
      qubes/tests/storage_reflink.py

+ 2 - 2
qubes/tests/storage_reflink.py

@@ -130,6 +130,8 @@ def mkdir_fs(directory, fs_type,
         cleanup_via(rmtree_fs, directory)
 
 def rmtree_fs(directory):
+    cmd('sudo', 'chattr', '-i', directory)
+    cmd('sudo', 'chmod', '777', directory)
     if os.path.ismount(directory):
         try:
             cmd('sudo', 'umount', directory)
@@ -137,8 +139,6 @@ def rmtree_fs(directory):
             cmd('sudo', 'fuser', '-vm', directory)
             raise
         # loop device and backing file are garbage collected automatically
-    cmd('sudo', 'chattr', '-i', directory)
-    cmd('sudo', 'chmod', '777', directory)
     shutil.rmtree(directory)
 
 def get_blockdev_size(dev):