Changeset 65729 in vbox

Timestamp:

Feb 10, 2017 1:07:38 PM (8 years ago)

Author:

vboxsync

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

113443

Message:

ValidationKit: when setting the MAC address: if we can't find out the IP address of the system, it's better to make the method fail, because that makes the VM creation and thus the test fail properly. The previous way of continuing silently (but with an increased error counter) leads to very delayed test failures which can't be easily identified.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (2 diffs)

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

@@ -1517 +1517 @@
             except:
                 reporter.errorXcpt('failed to determine the host IP for "%s".' % (sHostName,))
-                abHostIP = array.array('B', (0x80, 0x86, 0x00, 0x00)).tostring()
+                return False
             sDefaultMac = '%02X%02X%02X%02X%02X%02X' \
                 % (0x02, ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]), iNic)
@@ -1524 +1524 @@
         # Get the NIC object and try set it address.
         try:
-            oNic = self.o.machine.getNetworkAdapter(iNic);
-        except:
-            reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName));
-            return False;
-
-        try:
-            oNic.MACAddress = sMacAddr;
+            oNic = self.o.machine.getNetworkAdapter(iNic)
+        except:
+            reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName))
+            return False
+
+        try:
+            oNic.MACAddress = sMacAddr
         except:
             reporter.errorXcpt('failed to set the MAC address on slot %s to "%s" for VM "%s"' \
-                % (iNic, sMacAddr, self.sName));
-            return False;
-
-        reporter.log('set MAC address on slot %s to %s for VM "%s"' % (iNic, sMacAddr, self.sName));
-        return True;
+                % (iNic, sMacAddr, self.sName))
+            return False
+
+        reporter.log('set MAC address on slot %s to %s for VM "%s"' % (iNic, sMacAddr, self.sName))
+        return True
 
     def setRamSize(self, cMB):