Changeset 72742 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 29, 2018 7:34:14 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123278

Message:

ValKit: Cleanups.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/base.py (modified) (2 diffs)
• tests/additions/tdAddGuestCtrl.py (modified) (1 diff)
• tests/api/tdApi1.py (modified) (3 diffs)
• tests/api/tdMoveVM1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -857 +857 @@
 
         # List of sub-test drivers (SubTestDriverBase derivatives).
-        self.aoSubTstDrvs    = [];
+        self.aoSubTstDrvs    = [];          # type: list(SubTestDriverBase)
 
         # Use the scratch path for temporary files.
@@ -1384 +1384 @@
         TESTBOX_PATH_RESOURCES.
 
-        Override this.
-        """
-        return [];
+        Override this, call super when using sub-test drivers.
+        """
+        asRsrcs = [];
+        for oSubTstDrv in self.aoSubTstDrvs:
+            asRsrcs.extend(oSubTstDrv.asRsrcs);
+        return asRsrcs;
 
     def actionExtract(self):

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -3641 +3641 @@
         return iArg + 1;
 
-    def getResourceSet(self):
-        if self.asRsrcs is None:
-            self.asRsrcs = [];
-            for oSubTstDrv in self.aoSubTstDrvs:
-                self.asRsrcs.extend(oSubTstDrv.asRsrcs);
-            self.asRsrcs.extend(self.oTestVmSet.getResourceSet());
-        return self.asRsrcs;
-
     def actionConfig(self):
         if not self.importVBoxApi(): # So we can use the constant below.

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

@@ -50 +50 @@
     """
 
-    def __init__(self, aSubTestDrivers = None):
+    def __init__(self, aoSubTestDriverClasses = None):
         vbox.TestDriver.__init__(self)
-        self.asRsrcs = None;
-        for oSubTestDriverClass in aSubTestDrivers:
+        for oSubTestDriverClass in aoSubTestDriverClasses:
             self.addSubTestDriver(oSubTestDriverClass(self));
 
@@ -59 +58 @@
     # Overridden methods.
     #
-
-    def getResourceSet(self):
-        if self.asRsrcs is None:
-            self.asRsrcs = [];
-            for oSubTstDrv in self.aoSubTstDrvs:
-                self.asRsrcs.extend(oSubTstDrv.asRsrcs);
-        return self.asRsrcs;
 
     def actionConfig(self):
@@ -79 +71 @@
         Execute the testcase, i.e. all sub-tests.
         """
-        fRc = True
+        fRc = True;
         for oSubTstDrv in self.aoSubTstDrvs:
-            fRc &= oSubTstDrv.testIt()
-        return fRc
+            fRc &= oSubTstDrv.testIt();
+        return fRc;
 
 
 if __name__ == '__main__':
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-    from tdPython1 import SubTstDrvPython1
-    from tdAppliance1 import SubTstDrvAppliance1
-    from tdMoveMedium1 import SubTstDrvMoveMedium1
-    from tdTreeDepth1 import SubTstDrvTreeDepth1
-    from tdMoveVM1 import SubTstDrvMoveVM1
+    from tdPython1     import SubTstDrvPython1;
+    from tdAppliance1  import SubTstDrvAppliance1;
+    from tdMoveMedium1 import SubTstDrvMoveMedium1;
+    from tdTreeDepth1  import SubTstDrvTreeDepth1;
+    from tdMoveVM1     import SubTstDrvMoveVM1;
     sys.exit(tdApi1([SubTstDrvPython1, SubTstDrvAppliance1, SubTstDrvMoveMedium1,
                      SubTstDrvTreeDepth1, SubTstDrvMoveVM1]).main(sys.argv))

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

@@ -59 +59 @@
         base.SubTestDriverBase.__init__(self, 'move-vm', oTstDrv)
 
-        self.asRsrcs.append(os.path.join('5.3','isos','tdMoveVM1.iso'));
-        self.asRsrcs.append(os.path.join('5.3','floppy','tdMoveVM1.img'));
+        # Note! Hardcoded indexing in test code further down.
+        self.asRsrcs = [
+            os.path.join('5.3','isos','tdMoveVM1.iso'),
+            os.path.join('5.3','floppy','tdMoveVM1.img')
+        ];
 
         self.asImagesNames = []