Changeset 70695 in vbox for trunk/src/VBox/ValidationKit/tests/smoketests

Timestamp:

Jan 22, 2018 11:17:53 PM (7 years ago)

Author:

vboxsync

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

120432

Message:

tdExoticOrAncient1: sketches based on smoke tests.

Location:

trunk/src/VBox/ValidationKit/tests/smoketests

Files:

• Makefile.kmk (modified) (1 diff)
• tdExoticOrAncient1.py (copied) (copied from trunk/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py ) (6 diffs)

trunk/src/VBox/ValidationKit/tests/smoketests/Makefile.kmk

@@ -33 +33 @@
 ValidationKitTestsSmokeTests_INST = $(INST_VALIDATIONKIT)tests/smoketests/
 ValidationKitTestsSmokeTests_EXEC_SOURCES := \
-        $(PATH_SUB_CURRENT)/tdSmokeTest1.py
+        $(PATH_SUB_CURRENT)/tdSmokeTest1.py \
+        $(PATH_SUB_CURRENT)/tdExoticOrAncient1.py
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsSmokeTests_EXEC_SOURCES)

trunk/src/VBox/ValidationKit/tests/smoketests/tdExoticOrAncient1.py

@@ -4 +4 @@
 
 """
-VirtualBox Validation Kit - Smoke Test #1.
+VirtualBox Validation Kit - Exotic and/or ancient OSes #1.
 """
 
 __copyright__ = \
 """
-Copyright (C) 2010-2017 Oracle Corporation
+Copyright (C) 2010-2018 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 # Validation Kit imports.
 from testdriver import reporter;
-from testdriver import base;
 from testdriver import vbox;
-from testdriver import vboxcon;
 
 
-class tdSmokeTest1(vbox.TestDriver):
+class tdExoticOrAncient1(vbox.TestDriver):
     """
-    VBox Smoke Test #1.
+    VBox exotic and/or ancient OSes #1.
     """
 
@@ -56 +54 @@
         vbox.TestDriver.__init__(self);
         self.asRsrcs            = None;
-        self.oTestVmSet         = self.oTestVmManager.getSmokeVmSet();
-        self.sNicAttachmentDef  = 'mixed';
-        self.sNicAttachment     = self.sNicAttachmentDef;
-        self.fQuick             = False;
+        self.oTestVmSet         = self.oTestVmManager.selectSet(  self.oTestVmManager.kfGrpAncient
+                                                                | self.oTestVmManager.kfGrpExotic);
 
     #
@@ -66 +62 @@
     def showUsage(self):
         rc = vbox.TestDriver.showUsage(self);
-        reporter.log('');
-        reporter.log('Smoke Test #1 options:');
-        reporter.log('  --nic-attachment <bridged|nat|mixed>');
-        reporter.log('      Default: %s' % (self.sNicAttachmentDef));
-        reporter.log('  --quick');
-        reporter.log('      Very selective testing.')
         return rc;
 
     def parseOption(self, asArgs, iArg):
-        if asArgs[iArg] == '--nic-attachment':
-            iArg += 1;
-            if iArg >= len(asArgs): raise base.InvalidOption('The "--nic-attachment" takes an argument');
-            self.sNicAttachment = asArgs[iArg];
-            if self.sNicAttachment not in ('bridged', 'nat', 'mixed'):
-                raise base.InvalidOption('The "--nic-attachment" value "%s" is not supported. Valid values are: bridged, nat' \
-                        % (self.sNicAttachment));
-        elif asArgs[iArg] == '--quick':
-            # Disable all but a few VMs and configurations.
-            for oTestVm in self.oTestVmSet.aoTestVms:
-                if oTestVm.sVmName == 'tst-win2k3ent':          # 32-bit paging
-                    oTestVm.asVirtModesSup  = [ 'hwvirt' ];
-                    oTestVm.acCpusSup       = range(1, 2);
-                elif oTestVm.sVmName == 'tst-rhel5':            # 32-bit paging
-                    oTestVm.asVirtModesSup  = [ 'raw' ];
-                    oTestVm.acCpusSup       = range(1, 2);
-                elif oTestVm.sVmName == 'tst-win2k8':           # 64-bit
-                    oTestVm.asVirtModesSup  = [ 'hwvirt-np' ];
-                    oTestVm.acCpusSup       = range(1, 2);
-                elif oTestVm.sVmName == 'tst-sol10-64':         # SMP, 64-bit
-                    oTestVm.asVirtModesSup  = [ 'hwvirt' ];
-                    oTestVm.acCpusSup       = range(2, 3);
-                elif oTestVm.sVmName == 'tst-sol10':            # SMP, 32-bit
-                    oTestVm.asVirtModesSup  = [ 'hwvirt-np' ];
-                    oTestVm.acCpusSup       = range(2, 3);
-                else:
-                    oTestVm.fSkip = True;
-        else:
-            return vbox.TestDriver.parseOption(self, asArgs, iArg);
-        return iArg + 1;
+        return vbox.TestDriver.parseOption(self, asArgs, iArg);
 
     def actionVerify(self):
@@ -119 +80 @@
             return False;
 
-        # Do the configuring.
-        if self.sNicAttachment == 'nat':        eNic0AttachType = vboxcon.NetworkAttachmentType_NAT;
-        elif self.sNicAttachment == 'bridged':  eNic0AttachType = vboxcon.NetworkAttachmentType_Bridged;
-        else:                                   eNic0AttachType = None;
         assert self.sVBoxValidationKitIso is not None;
-        return self.oTestVmSet.actionConfig(self, eNic0AttachType = eNic0AttachType, sDvdImage = self.sVBoxValidationKitIso);
+        return self.oTestVmSet.actionConfig(self, sDvdImage = self.sVBoxValidationKitIso);
 
     def actionExecute(self):
@@ -142 +99 @@
         """
 
-        oSession = self.openSession(oVM);
-
-        # Enable audio adapter
-        oSession.o.machine.audioAdapter.enabled = True;
-
-        fRc = oSession.saveSettings();
-        fRc = fRc and oSession.close();
-        assert fRc is True;
-
         # Simple test.
         self.logVmInfo(oVM);
-        oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True);
-        if oSession is not None:
-            self.addTask(oTxsSession);
-
-            ## @todo do some quick tests: save, restore, execute some test program, shut down the guest.
-
-            # cleanup.
-            self.removeTask(oTxsSession);
-            self.terminateVmBySession(oSession)
-            return True;
+        if oTestVm.fGrouping & self.oTestVmManager.kfGrpNoTxs:
+            pass;   ## @todo serial port VMs.
+        else:
+            oSession, _ = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True);
+            if oSession is not None:
+                self.terminateVmBySession(oSession)
+                return True;
         return None;
 
 if __name__ == '__main__':
-    sys.exit(tdSmokeTest1().main(sys.argv));
+    sys.exit(tdExoticOrAncient1().main(sys.argv));