Merge pull request #2910 from disgoel/stress-ng-fix

stress-ng: fix teardown
avocado-framework-tests · Oct 24, 2024 · 0ad19b1 · 0ad19b1
2 parents 5d7c4df + 8b8766c
commit 0ad19b1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/generic/stress-ng.py b/generic/stress-ng.py
@@ -198,11 +198,12 @@ def test(self):
                       "\n".join(ERROR))
 
     def tearDown(self):
-        if 'filesystem' in self.class_type:
+        if hasattr(self, 'loop_dev') and os.path.exists(self.loop_dev):
             process.run("umount %s" % self.loop_dev, ignore_status=True,
                         sudo=True)
             process.run("losetup -d %s" % self.loop_dev, ignore_status=True,
                         sudo=True)
+        if os.path.exists('/tmp/blockfile'):
             process.run("rm -rf /tmp/blockfile", ignore_status=True, sudo=True)
-            if (os.path.exists(self.stressmnt)):
-                process.run(f"rm -rf {self.stressmnt}")
+        if hasattr(self, 'stressmnt') and os.path.exists(self.stressmnt):
+            process.run(f"rm -rf {self.stressmnt}", ignore_status=True)