Changeset 70657 in vbox

Timestamp:

Jan 20, 2018 7:02:11 PM (7 years ago)

Author:

vboxsync

Message:

testdriver: fixes:

Location:

trunk/src/VBox/ValidationKit

Files:

• testboxscript/testboxscript.py (modified) (2 diffs)
• testdriver/vboxtestvms.py (modified) (5 diffs)
• tests/audio/tdGuestHostTimings.py (modified) (1 diff)
• tests/installation/tdGuestOsInstTest1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testboxscript/testboxscript.py

@@ -9 +9 @@
 abnormally or due to an UPGRADE request.
 """
+
+from __future__ import print_function;
 
 __copyright__ = \
@@ -67 +69 @@
         """
         if self.oTask is not None:
-            print('Wait for child task...')
+            print('Wait for child task...');
             self.oTask.terminate()
             self.oTask.wait()
-            print('done. Exiting')
+            print('done. Exiting');
             self.oTask = None;
 

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

@@ -30 +30 @@
 
 # Standard Python imports.
+import copy;
 import os;
 import re;
@@ -190 +191 @@
     """
 
-    def __init__(self, sVmName, fGrouping, sHd = None, sKind = None, acCpusSup = None, # pylint: disable=R0913
-                 asVirtModesSup = None, fIoApic = None, fPae = None, sNic0AttachType = None,
-                 sFloppy = None, fVmmDevTestingPart = None, fVmmDevTestingMmio = False, asParavirtModesSup = None,
-                 fRandomPvPMode = False, sFirmwareType = 'bios', sChipsetType = 'piix3',
-                 sHddControllerType = 'IDE Controller', sDvdControllerType = 'IDE Controller'):
-        self.oSet                    = None; ### ???
+    def __init__(self, # pylint: disable=R0913
+                 sVmName,                                   # type: str
+                 fGrouping,                                 # type: bool
+                 oSet = None,                               # type: TestVmSet
+                 sHd = None,                                # type: str
+                 sKind = None,                              # type: str
+                 acCpusSup = None,                          # type: List[int]
+                 asVirtModesSup = None,                     # type: List[str]
+                 fIoApic = None,                            # type: bool
+                 fPae = None,                               # type: bool
+                 sNic0AttachType = None,                    # type: str
+                 sFloppy = None,                            # type: str
+                 fVmmDevTestingPart = None,                 # type: bool
+                 fVmmDevTestingMmio = False,                # type: bool
+                 asParavirtModesSup = None,                 # type: List[str]
+                 fRandomPvPMode = False,                    # type: bool
+                 sFirmwareType = 'bios',                    # type: str
+                 sChipsetType = 'piix3',                    # type: str
+                 sHddControllerType = 'IDE Controller',     # type: str
+                 sDvdControllerType = 'IDE Controller'      # type: str
+                 ):
+        self.oSet                    = oSet;
         self.sVmName                 = sVmName;
         self.fGrouping               = fGrouping;
@@ -976 +993 @@
         self.sResourcePath = sResourcePath;
 
+    def selectSet(self, fGrouping, sTxsTransport = None, fCheckResources = True):
+        """
+        Returns a VM set with the selected VMs.
+        """
+        oSet = TestVmSet(oTestVmManager = self);
+        for oVm in g_aTestVMs:
+            if oVm.fGrouping & fGrouping:
+                if sTxsTransport is None  or  oVm.sNic0AttachType is None  or  sTxsTransport == oVm.sNic0AttachType:
+                    if not fCheckResources  or  len(oVm.getMissingResources(self.sResourcePath)) == 0:
+                        oCopyVm = copy.deepcopy(oVm);
+                        oCopyVm.oSet = oSet;
+                        oSet.aoTestVms.append(oCopyVm);
+        return oSet;
+
     def getStandardVmSet(self, sTxsTransport):
         """
@@ -983 +1014 @@
         testrsrc tree for usable VMs, but for the moment it's all hard coded. :-)
         """
-
-
-        oSet = TestVmSet(oTestVmManager = self);
-        for oVm in g_aTestVMs:
-            if oVm.fGrouping & g_kfGrpStandard:
-                if sTxsTransport is None  or  oVm.sNic0AttachType is None  or  sTxsTransport == oVm.sNic0AttachType:
-                    if len(oVm.getMissingResources(self.sResourcePath)) == 0:
-                        oSet.aoTestVms.append(oVm);
-                        oVm.oSet = oSet; ## ???
-        return oSet;
+        return self.selectSet(g_kfGrpStandard, sTxsTransport)
 
     def getSmokeVmSet(self):
@@ -998 +1020 @@
         Gets a representative set of VMs for smoke testing.
         """
-
-        oSet = TestVmSet(oTestVmManager = self);
-        for oVm in g_aTestVMs:
-            if oVm.fGrouping & g_kfGrpSmoke:
-                if len(oVm.getMissingResources(self.sResourcePath)) == 0:
-                    oSet.aoTestVms.append(oVm);
-                    oVm.oSet = oSet; ## ???
-        return oSet;
+        return self.selectSet(g_kfGrpSmoke);
 
     def shutUpPyLint(self):

trunk/src/VBox/ValidationKit/tests/audio/tdGuestHostTimings.py

@@ -56 +56 @@
         self.sSessionTypeDef = 'gui';
 
-        self.oTestVmSet = self.oTestVmManager.getStandardVmSet('nat')
+        self.oTestVmSet = self.oTestVmManager.getStandardVmSet('nat') ## ???
 
         # Use the command line "--test-vms mw7x64 execute" to run the only "mw7x64" VM
-        oTestVm = vboxtestvms.TestVm(self.oTestVmSet, 'mw7x64', sHd = 'mw7x64.vdi',
-                         sKind = 'Windows7', acCpusSup = range(1, 2), fIoApic = True, sFirmwareType = 'bios',
-                            asParavirtModesSup = ['hyperv'], asVirtModesSup = ['hwvirt-np'], sHddControllerType = 'SATA Controller');
+        oTestVm = vboxtestvms.TestVm('mw7x64', oSet = self.oTestVmSet, sHd = 'mw7x64.vdi',
+                                     sKind = 'Windows7', acCpusSup = range(1, 2), fIoApic = True, sFirmwareType = 'bios',
+                                     asParavirtModesSup = ['hyperv'], asVirtModesSup = ['hwvirt-np'],
+                                     sHddControllerType = 'SATA Controller');
 
         self.oTestVmSet.aoTestVms.append(oTestVm);

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py

@@ -81 +81 @@
 
     def __init__(self, oSet, sVmName, sKind, sInstallIso, sHdCtrlNm, cGbHdd, fFlags):
-        vboxtestvms.TestVm.__init__(self, oSet, sVmName, sKind = sKind, sHddControllerType = sHdCtrlNm,
+        vboxtestvms.TestVm.__init__(self, sVmName, oSet = oSet, sKind = sKind, sHddControllerType = sHdCtrlNm,
                                     fRandomPvPMode = (fFlags & self.kfNoWin81Paravirt) == 0);
         self.sDvdImage    = os.path.join(self.ksIsoPathBase, sInstallIso);