Use rm -rf for deleting temp directories on Windows too

zeek · Jan 4, 2023 · b703e50 · b703e50
1 parent 17df3c8
commit b703e50
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/btest b/btest
@@ -1386,11 +1386,7 @@ class Test(object):
                 os.remove(self.tmpdir)
 
             if os.path.isdir(self.tmpdir):
-                if sys.platform == 'win32':
-                    win_path = pathlib.PureWindowsPath(self.tmpdir)
-                    subprocess.call("rmdir /s /q %s" % (str(win_path)), shell=True)
-                else:
-                    subprocess.call("rm -rf %s 2>/dev/null" % (self.tmpdir), shell=True)
+                subprocess.call("rm -rf %s 2>/dev/null" % self.tmpdir, stderr=subprocess.DEVNULL)
 
         except OSError as e:
             error("cannot remove tmp directory %s: %s" % (self.tmpdir, e))