From 11f3f33e7b4daf5a62e2a67530b587bdabfa577b Mon Sep 17 00:00:00 2001 From: Axel Gembe Date: Wed, 11 Oct 2023 13:46:17 +0700 Subject: [PATCH] tests: remove excessive time.sleep usage from tests.py There is a cumulative 12 minutes worth of time.sleep in this test seemingly for no good reason. --- contrib/windows/tests/tests.py | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/contrib/windows/tests/tests.py b/contrib/windows/tests/tests.py index 006e2f40b692..a79afbf99933 100644 --- a/contrib/windows/tests/tests.py +++ b/contrib/windows/tests/tests.py @@ -8,8 +8,6 @@ # from pprint import pprint -import time - # import json import logging @@ -204,12 +202,10 @@ def main(): preTest() ret = runWithPrint(["zpool", "create", "-f", "test01", tounc(f1)]) - time.sleep(10) if ret.returncode != 0: print("FAIL") print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test01"]) - time.sleep(10) postTest() preTest() @@ -217,10 +213,8 @@ def main(): tounc(f2)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test02"]) - time.sleep(10) postTest() preTest() @@ -228,10 +222,8 @@ def main(): tounc(f2), tounc(f3)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test03"]) - time.sleep(10) postTest() preTest() @@ -239,21 +231,17 @@ def main(): tounc(f1), tounc(f2)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test04"]) - time.sleep(10) postTest() preTest() ret = runWithPrint(["zpool", "create", "-f", "test05", "mirror", tounc(f1), tounc(f2), tounc(f3)]) - time.sleep(10) if ret.returncode != 0: print("FAIL") print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test05"]) - time.sleep(10) postTest() preTest() @@ -261,10 +249,8 @@ def main(): tounc(f1), tounc(f2), tounc(f3)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test06"]) - time.sleep(10) postTest() preTest() @@ -272,10 +258,8 @@ def main(): tounc(f1), tounc(f2), tounc(f3)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "test07"]) - time.sleep(10) postTest() preTest("snapshot no hang:") @@ -283,7 +267,6 @@ def main(): ret = runWithPrint(["zpool", "create", "-f", "testsn01", tounc(f1)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) f = PureWindowsPath(get_driveletters()[0][1], "test01.file") @@ -299,11 +282,9 @@ def main(): ret = runWithPrint(["zpool", "export", "-a"]) if ret.returncode != 0: print("FAIL") - time.sleep(10) runWithPrint(["zpool", "destroy", "-f", "testsn01"]) - time.sleep(10) postTest() # preTest("snapshot hang") @@ -311,7 +292,6 @@ def main(): # ret = runWithPrint(["zpool", "create", "-f", "testsn02", tounc(f1)]) # if ret.returncode != 0: # print("FAIL") - # time.sleep(10) # print("Drive letters after pool create:", get_driveletters()) # # f = PureWindowsPath(get_driveletters()[0][1], "test01.file") @@ -333,10 +313,8 @@ def main(): # ret = runWithPrint(["zpool", "export", "-a"]) # if ret.returncode != 0: # print("FAIL") - # time.sleep(10) # # runWithPrint(["zpool", "destroy", "-f", "testsn02"]) - # time.sleep(10) # postTest() preTest("regex for key file") @@ -357,7 +335,6 @@ def main(): "tank", tounc(f1)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) ret = runWithPrint(["zfs", "get", "keylocation", "tank"]) @@ -367,7 +344,6 @@ def main(): ret = runWithPrint(["zpool", "export", "tank"]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters before pool create:", get_driveletters()) ret = runWithPrint(["zpool", "import", "-f", "-l", "-O", @@ -376,11 +352,9 @@ def main(): tounc(f1)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) runWithPrint(["zpool", "destroy", "-f", "tank"]) - time.sleep(10) postTest() preTest("run out of drive letters") @@ -390,7 +364,6 @@ def main(): tounc(f1)]) if ret.returncode != 0: print("FAIL") - time.sleep(10) print("Drive letters after pool create:", get_driveletters()) @@ -401,7 +374,6 @@ def main(): print("FAIL") runWithPrint(["zpool", "destroy", "-f", "tank" + str(i)]) - time.sleep(10) postTest()