Changeset 90243 in vbox

Timestamp:

Jul 19, 2021 3:46:31 PM (4 years ago)

Author:

vboxsync

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

145781

Message:

testdriver/vbox.py: Fix floating point rounding issues (0.1 is known to be tricky...) which showed up for 6.1.97. Also, the API version correction was incorrect for pre-release versions of the next major API release.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

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

@@ -1413 +1413 @@
                                     % (sVer, aiVerComponents[2]));
 
-            # Convert the three integers into a floating point value.  The API is table witin a
+            # Convert the three integers into a floating point value.  The API is stable within a
             # x.y release, so the third component only indicates whether it's a stable or
             # development build of the next release.
             self.fpApiVer = aiVerComponents[0] + 0.1 * aiVerComponents[1];
             if aiVerComponents[2] >= 51:
-                if self.fpApiVer not in [4.3, 3.2,]:
+                if self.fpApiVer not in [6.1, 5.2, 4.3, 3.2,]:
                     self.fpApiVer += 0.1;
                 else:
-                    self.fpApiVer += 1.1;
+                    self.fpApiVer = int(self.fpApiVer) + 1.0;
+            # fudge value to be always bigger than the nominal value (0.1 gets rounded down)
+            if round(self.fpApiVer, 1) > self.fpApiVer:
+                self.fpApiVer += sys.float_info.epsilon * self.fpApiVer / 2.0;
 
             try: