Changeset 70812 in vbox for trunk/src/VBox/ValidationKit/tests/api/tdTreeDepth1.py

Timestamp:

Jan 30, 2018 5:46:55 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Turn all API tests into sub-tests which can still be run separately. tdApi1.py runs them all in one go.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdTreeDepth1.py (modified) (6 diffs)

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

@@ -42 +42 @@
 
 # Validation Kit imports.
+from testdriver import base
 from testdriver import reporter
-from testdriver import vbox
 from testdriver import vboxcon
 
 
-class tdTreeDepth1(vbox.TestDriver):
+class SubTstDrvTreeDepth1(base.SubTestDriverBase):
     """
-    Medium and Snapshot Tree Depth Test #1.
+    Sub-test driver for Medium and Snapshot Tree Depth Test #1.
     """
 
-    def __init__(self):
-        vbox.TestDriver.__init__(self)
-        self.asRsrcs            = None
+    def __init__(self, oTstDrv):
+        base.SubTestDriverBase.__init__(self, 'tree-depth', oTstDrv)
 
-
-    #
-    # Overridden methods.
-    #
-
-    def actionConfig(self):
+    def testIt(self):
         """
-        Import the API.
-        """
-        if not self.importVBoxApi():
-            return False
-        return True
-
-    def actionExecute(self):
-        """
-        Execute the testcase.
+        Execute the sub-testcase.
         """
         return  self.testMediumTreeDepth() \
@@ -87 +73 @@
 
         try:
-            oVM = self.createTestVM('test-medium', 1, None, 4)
+            oVM = self.oTstDrv.createTestVM('test-medium', 1, None, 4)
             assert oVM is not None
 
             # create chain with 300 disk images (medium tree depth limit)
             fRc = True
-            oSession = self.openSession(oVM)
+            oSession = self.oTstDrv.openSession(oVM)
             for i in range(1, 301):
-                sHddPath = os.path.join(self.sScratchPath, 'Test' + str(i) + '.vdi')
+                sHddPath = os.path.join(self.oTstDrv.sScratchPath, 'Test' + str(i) + '.vdi')
                 if i is 1:
                     oHd = oSession.createBaseHd(sHddPath, cb=1024*1024)
@@ -112 +98 @@
             reporter.log('unregistering VM')
             oVM.unregister(vboxcon.CleanupMode_DetachAllReturnNone)
-            oVBox = self.oVBoxMgr.getVirtualBox()
+            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
             reporter.log('opening VM %s, testing config reading' % (sSettingsFile))
             oVM = oVBox.openMachine(sSettingsFile)
@@ -129 +115 @@
 
         try:
-            oVM = self.createTestVM('test-snap', 1, None, 4)
+            oVM = self.oTstDrv.createTestVM('test-snap', 1, None, 4)
             assert oVM is not None
 
             # modify the VM config, create and attach empty HDD
-            oSession = self.openSession(oVM)
-            sHddPath = os.path.join(self.sScratchPath, 'TestSnapEmpty.vdi')
+            oSession = self.oTstDrv.openSession(oVM)
+            sHddPath = os.path.join(self.oTstDrv.sScratchPath, 'TestSnapEmpty.vdi')
             fRc = True
             fRc = fRc and oSession.createAndAttachHd(sHddPath, cb=1024*1024, sController='SATA Controller', fImmutable=False)
@@ -148 +134 @@
             reporter.log('unregistering VM')
             oVM.unregister(vboxcon.CleanupMode_DetachAllReturnNone)
-            oVBox = self.oVBoxMgr.getVirtualBox()
+            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
             reporter.log('opening VM %s, testing config reading' % (sSettingsFile))
             oVM = oVBox.openMachine(sSettingsFile)
@@ -160 +146 @@
 
 if __name__ == '__main__':
-    sys.exit(tdTreeDepth1().main(sys.argv))
+    sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+    from tdApi1 import tdApi1
+    oTstDrv = tdApi1()
+    oTstDrv.addSubTestDriver(SubTstDrvTreeDepth1(oTstDrv))
+    sys.exit(oTstDrv.main(sys.argv))