Changeset 72732 in vbox

Timestamp:

Jun 29, 2018 6:53:30 AM (7 years ago)

Author:

vboxsync

Message:

Valkit: Resource handling regression fix.

Location:

trunk/src/VBox/ValidationKit

Files:

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

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

@@ -744 +744 @@
         self.sName              = sName;
         self.oTstDrv            = oTstDrv;
+        self.asRsrcs            = [];
 
 

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

@@ -1767 +1767 @@
 
     def getResourceSet(self):
-        asRsrcs = []
+        asRsrcs = [];
         if self.oTestVmSet is not None:
-            asRsrcs.extend(self.oTestVmSet.getResourceSet())
-        asRsrcs = base.TestDriver.getResourceSet(self)
-        return asRsrcs
+            asRsrcs.extend(self.oTestVmSet.getResourceSet());
+        asRsrcs.extend(base.TestDriver.getResourceSet(self));
+        return asRsrcs;
 
     def actionExtract(self):

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

@@ -932 +932 @@
         ];
         self.asTests    = self.asTestsDef;
-
-        self.asRsrcs    = []
-        self.asRsrcs.append('5.3/guestctrl/50mb_rnd.dat')
+        self.asRsrcs    = ['5.3/guestctrl/50mb_rnd.dat', ];
 
     def parseOption(self, asArgs, iArg):                                        # pylint: disable=R0912,R0915
@@ -3613 +3611 @@
         vbox.TestDriver.__init__(self);
         self.oTestVmSet = self.oTestVmManager.getSmokeVmSet('nat');
-        self.asRsrcs    = None
+        self.asRsrcs    = None;
         self.fQuick     = False; # Don't skip lengthly tests by default.
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -3645 +3643 @@
     def getResourceSet(self):
         if self.asRsrcs is None:
-            self.asRsrcs = []
+            self.asRsrcs = [];
             for oSubTstDrv in self.aoSubTstDrvs:
-                self.asRsrcs.extend(oSubTstDrv.asRsrcs)
-            self.asRsrcs.extend(self.oTestVmSet.getResourceSet())
-        return self.asRsrcs
+                self.asRsrcs.extend(oSubTstDrv.asRsrcs);
+            self.asRsrcs.extend(self.oTestVmSet.getResourceSet());
+        return self.asRsrcs;
 
     def actionConfig(self):

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

@@ -52 +52 @@
     def __init__(self, aSubTestDrivers = None):
         vbox.TestDriver.__init__(self)
-        self.asRsrcs = None
-        for classSubTestDrivers in aSubTestDrivers:
-            self.addSubTestDriver(classSubTestDrivers(self))
+        self.asRsrcs = None;
+        for oSubTestDriverClass in aSubTestDrivers:
+            self.addSubTestDriver(oSubTestDriverClass(self));
 
     #
@@ -62 +62 @@
     def getResourceSet(self):
         if self.asRsrcs is None:
-            self.asRsrcs = []
+            self.asRsrcs = [];
             for oSubTstDrv in self.aoSubTstDrvs:
-                self.asRsrcs.extend(oSubTstDrv.asRsrcs)
-        return self.asRsrcs
+                self.asRsrcs.extend(oSubTstDrv.asRsrcs);
+        return self.asRsrcs;
 
     def actionConfig(self):

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

@@ -60 +60 @@
         Execute the sub-testcase.
         """
-        return  self.testMediumMove()
+        return self.testMediumMove()
 
     #

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

@@ -59 +59 @@
         base.SubTestDriverBase.__init__(self, 'move-vm', oTstDrv)
 
-        self.asRsrcs = []
         self.asRsrcs.append(os.path.join('5.3','isos','tdMoveVM1.iso'));
         self.asRsrcs.append(os.path.join('5.3','floppy','tdMoveVM1.img'));