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

Timestamp:

Apr 5, 2023 9:19:25 AM (22 months ago)

Author:

vboxsync

Message:

Validation Kit/vbox.py: Added a couple of functions for Guest Additions / general version handling and comparison. Required for cross host + Guest Additions testing (e.g. old(er) Guest Additions on newer host versions and vice versa) [pylint].

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (3 diffs)

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

@@ -1757 +1757 @@
 
     @staticmethod
-    def versionToTuple(sVer, fIgnoreErrors = False): # pylint: disable=line-too-long
+    def versionToTuple(sVer, fIgnoreErrors = False):
         """
         Returns a semantic versioning string as a tuple.
@@ -1764 +1764 @@
             # Regular expression taken from semver.org (recommended regular expression for semantic version strings).
             # Creative Commons ― CC BY 3.0
-            oRegEx = re.compile('^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$');
+            oRegEx = re.compile(r'^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'); # pylint: disable=line-too-long
             oMatch = oRegEx.search(sVer);
             return oMatch.groups();
@@ -1808 +1808 @@
         Returns True if version 1 is equal or bigger than version 2, False if not.
         """
-        return False if TestDriver.compareVersion(sVer1, sVer2, fIgnoreErrors) is 1 else True;
+        return not TestDriver.compareVersion(sVer1, sVer2, fIgnoreErrors);
 
     def getGuestAdditionsVersion(self, oSession, fIgnoreErrors = False):