Bladeren bron

Revert "tests: do not use lazy unmount"

Revert to use umount -l in storage tests cleanup. With fixed permissions
in 4234fe51 "tests: fix cleanup after reflink tests", it shouldn't cause
issues anymore, but apparently on some systems test cleanup fails
otherwise.

Reported by @rustybird
This reverts commit b6f77ebfa104df519fe271814d16073de109f282.
Marek Marczykowski-Górecki 5 jaren geleden
bovenliggende
commit
883d324b6c
1 gewijzigde bestanden met toevoegingen van 1 en 5 verwijderingen
  1. 1 5
      qubes/tests/storage_reflink.py

+ 1 - 5
qubes/tests/storage_reflink.py

@@ -135,11 +135,7 @@ def rmtree_fs(directory):
     cmd('sudo', 'chattr', '-i', directory)
     cmd('sudo', 'chmod', '777', directory)
     if os.path.ismount(directory):
-        try:
-            cmd('sudo', 'umount', directory)
-        except:
-            cmd('sudo', 'fuser', '-vm', directory)
-            raise
+        cmd('sudo', 'umount', '-l', directory)
         # loop device and backing file are garbage collected automatically
     shutil.rmtree(directory)