Changeset 69591 in vbox

Timestamp:

Nov 6, 2017 9:56:48 AM (7 years ago)

Author:

vboxsync

Message:

tdGuestOsInstOs2.py: got rid of self.oVM.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (1 diff)
• tests/installation/tdGuestOsInstOs2.py (modified) (4 diffs)

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

@@ -2334 +2334 @@
                 oVM = self.oVBox.findMachine(sNameOrId);
             else:
-                reporter.error('Port me!'); ## @todo Add support for older version < 4.0.
+                reporter.error('fpApiVer=%s - did you remember to initialize the API' % (self.fpApiVer,));
         except:
             reporter.errorXcpt('could not find vm "%s"' % (sNameOrId,));

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

@@ -84 +84 @@
         self.sFloppy             = None
         self.sIsoPathBase        = os.path.join(self.sResourcePath, '4.2', 'isos')
-        self.oVM                 = None
         self.fEnableIOAPIC       = True
         self.cCpus               = 1
@@ -160 +159 @@
         self.sFloppy = os.path.join(self.sIsoPathBase, os.path.splitext(self.sIso)[0] + '.img')
 
-        self.oVM = self.createTestVM(self.sVmName, 1, sKind = sKind, sDvdImage = self.sIso, cCpus = self.cCpus,
-                                     sFloppy = self.sFloppy, eNic0AttachType = eNic0AttachType)
-        assert self.oVM is not None
-
-        oSession = self.openSession(self.oVM)
+        oVM = self.createTestVM(self.sVmName, 1, sKind = sKind, sDvdImage = self.sIso, cCpus = self.cCpus,
+                                sFloppy = self.sFloppy, eNic0AttachType = eNic0AttachType)
+        assert oVM is not None
+
+        oSession = self.openSession(oVM)
 
         # Create HDD
@@ -216 +215 @@
         Execute the testcase itself.
         """
+        if not self.importVBoxApi():
+            return False
         return self.testDoInstallGuestOs()
 
@@ -226 +227 @@
         Install guest OS and wait for result
         """
-
-        self.logVmInfo(self.oVM)
         reporter.testStart('Installing %s' % (os.path.basename(self.sIso),))