Changeset 78634 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 21, 2019 2:22:03 PM (6 years ago)

Author:

vboxsync

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

130702

Message:

tdCreateVMWithDefaults1.py: Corrections and adjustments.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdCreateVMWithDefaults1.py (modified) (1 diff)

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

@@ -160 +160 @@
         """
         if not self.importVBoxApi():
-            return False
+            return reporter.error('importVBoxApi');
 
-        aoGuestTypes = self.oVBoxMgr.getArray(self.oVBox, 'guestOSTypes')
-        if aoGuestTypes is None or len(aoGuestTypes) < 1:
-            return False;
+        # Get the guest OS types.
+        try:
+            aoGuestTypes = self.oVBoxMgr.getArray(self.oVBox, 'guestOSTypes')
+            if aoGuestTypes is None or len(aoGuestTypes) < 1:
+                return reporter.error('No guest OS types');
+        except:
+            return reporter.errorXcpt();
 
-        reporter.testStart('create-vm-with-defaults')
+        # Create VMs with defaults for each of the guest types.
+        reporter.testStart('Create VMs with defaults');
         fRc = True
-        try:
-            for oGuestType in aoGuestTypes:
-                reporter.testStart('Checking VM creation (%s)' % (oGuestType.id))
-                fRc = self.createVMWithDefaults(oGuestType.id)
-                reporter.testDone()
-                if not fRc:
-                    break
-
-            assert fRc is True
-        except:
-            reporter.errorXcpt()
-
-        reporter.testDone('create-vm-with-defaults')
+        for oGuestType in aoGuestTypes:
+            try:
+                sGuestType = oGuestType.id;
+            except:
+                fRc = reporter.errorXcpt();
+            else:
+                reporter.testStart(sGuestType);
+                fRc = self.createVMWithDefaults(sGuestType) & fRc;
+                reporter.testDone();
+        reporter.testDone();
 
         return fRc