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

Timestamp:

Jun 28, 2018 3:30:16 PM (7 years ago)

Author:

vboxsync

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

123260

Message:

validationkit/tests/api: properly report resources, collected from all sub-tests

Location:

trunk/src/VBox/ValidationKit/tests/api

Files:

• tdApi1.py (modified) (2 diffs)
• tdMoveVM1.py (modified) (1 diff)

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

@@ -52 +52 @@
     def __init__(self, aSubTestDrivers = None):
         vbox.TestDriver.__init__(self)
-        self.asRsrcs            = None
+        self.asRsrcs = None
         for classSubTestDrivers in aSubTestDrivers:
             self.addSubTestDriver(classSubTestDrivers(self))
@@ -59 +59 @@
     # 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):

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

@@ -62 +62 @@
         self.asRsrcs.append(os.path.join('5.3','isos','tdMoveVM1.iso'));
         self.asRsrcs.append(os.path.join('5.3','floppy','tdMoveVM1.img'));
-
-        if oTstDrv.asRsrcs is None:
-            oTstDrv.asRsrcs = [];
-        oTstDrv.asRsrcs.extend(self.asRsrcs);
 
         self.asImagesNames = []