PYTHON-1021 - Support git describe based server versions

behackett · behackett · commit 8ee51cf43887 · 2015-12-15T15:40:35.000-08:00
diff --git a/test/version.py b/test/version.py
@@ -25,6 +25,7 @@ def _padded(iter, length, padding=0):
 
 def _parse_version_string(version_string):
     mod = 0
+    bump_patch_level = False
     if version_string.endswith("+"):
         version_string = version_string[0:-1]
         mod = 1
@@ -35,20 +36,44 @@ def _parse_version_string(version_string):
         version_string = version_string[0:-1]
         mod = -1
     # Deal with '-rcX' substrings
-    if version_string.find('-rc') != -1:
+    if '-rc' in version_string:
         version_string = version_string[0:version_string.find('-rc')]
         mod = -1
+    # Deal with git describe generated substrings
+    elif '-' in version_string:
+        version_string = version_string[0:version_string.find('-')]
+        mod = -1
+        bump_patch_level = True
+
 
     version = [int(part) for part in version_string.split(".")]
     version = _padded(version, 3)
+    # Make _parse_version_string and _parse_version_array agree. For example:
+    # MongoDB Enterprise > db.runCommand('buildInfo').versionArray
+    # [ 3, 2, 1, -100 ]
+    # MongoDB Enterprise > db.runCommand('buildInfo').version
+    # 3.2.0-97-g1ef94fe
+    if bump_patch_level:
+        version[-1] += 1
     version.append(mod)
 
     return tuple(version)
 
 
+def _parse_version_array(version_array):
+    version = list(version_array)
+    if version[-1] < 0:
+        version[-1] = -1
+    version = _padded(version, 3)
+    return tuple(version)
+
+
 # Note this is probably broken for very old versions of the database...
 def version(client):
-    return _parse_version_string(client.server_info()["version"])
+    info = client.server_info()
+    if "versionArray" in info:
+        return _parse_version_array(info["versionArray"])
+    return _parse_version_string(info["version"])
 
 
 def at_least(client, min_version):
