Changeset 70816 in vbox for trunk/src/VBox/ValidationKit/tests/api

Timestamp:

Jan 30, 2018 6:20:29 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: For API tests move some redundant object construction to the test constructor, saving a few lines, and what's most important avoid a variable in global scope which pylint doesn't like.

Location:

trunk/src/VBox/ValidationKit/tests/api

Files:

• tdApi1.py (modified) (2 diffs)
• tdAppliance1.py (modified) (1 diff)
• tdMoveMedium1.py (modified) (1 diff)
• tdPython1.py (modified) (1 diff)
• tdTreeDepth1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/api/tdApi1.py

@@ -50 +50 @@
     """
 
-    def __init__(self, aoSubTestDrivers = None):
+    def __init__(self, aSubTestDrivers = None):
         vbox.TestDriver.__init__(self)
         self.asRsrcs            = None
+        for classSubTestDrivers in aSubTestDrivers:
+            self.addSubTestDriver(classSubTestDrivers(self))
 
     #
@@ -78 +80 @@
 if __name__ == '__main__':
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-    oTD = tdApi1()
     from tdPython1 import SubTstDrvPython1
-    oTD.addSubTestDriver(SubTstDrvPython1(oTD))
     from tdAppliance1 import SubTstDrvAppliance1
-    oTD.addSubTestDriver(SubTstDrvAppliance1(oTD))
     from tdMoveMedium1 import SubTstDrvMoveMedium1
-    oTD.addSubTestDriver(SubTstDrvMoveMedium1(oTD))
     from tdTreeDepth1 import SubTstDrvTreeDepth1
-    oTD.addSubTestDriver(SubTstDrvTreeDepth1(oTD))
-    sys.exit(oTD.main(sys.argv))
+    sys.exit(tdApi1([SubTstDrvPython1, SubTstDrvAppliance1, SubTstDrvMoveMedium1, SubTstDrvTreeDepth1]).main(sys.argv))
 

trunk/src/VBox/ValidationKit/tests/api/tdAppliance1.py

@@ -202 +202 @@
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
     from tdApi1 import tdApi1
-    oTD = tdApi1()
-    oTD.addSubTestDriver(SubTstDrvAppliance1(oTD))
-    sys.exit(oTD.main(sys.argv))
-
+    sys.exit(tdApi1([SubTstDrvAppliance1]).main(sys.argv))
+

trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py

@@ -163 +163 @@
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
     from tdApi1 import tdApi1
-    oTD = tdApi1()
-    oTD.addSubTestDriver(SubTstDrvMoveMedium1(oTD))
-    sys.exit(oTD.main(sys.argv))
+    sys.exit(tdApi1([SubTstDrvMoveMedium1]).main(sys.argv))
 

trunk/src/VBox/ValidationKit/tests/api/tdPython1.py

@@ -208 +208 @@
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
     from tdApi1 import tdApi1
-    oTD = tdApi1()
-    oTD.addSubTestDriver(SubTstDrvPython1(oTD))
-    sys.exit(oTD.main(sys.argv))
-
+    sys.exit(tdApi1([SubTstDrvPython1]).main(sys.argv))
+

trunk/src/VBox/ValidationKit/tests/api/tdTreeDepth1.py

@@ -148 +148 @@
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
     from tdApi1 import tdApi1
-    oTD = tdApi1()
-    oTD.addSubTestDriver(SubTstDrvTreeDepth1(oTD))
-    sys.exit(oTD.main(sys.argv))
+    sys.exit(tdApi1([SubTstDrvTreeDepth1]).main(sys.argv))