(PTFE-2534) Remove sort and modify test assertion

Author: matthiasL-scality

bert_e/tests/test_bert_e.py

@@ -569,7 +569,7 @@ def test_branch_cascade_mixed_versions(self):
             2: {'name': 'development/4.3', 'ignore': True},
             3: {'name': 'development/5.1.8', 'ignore': True},
             4: {'name': 'development/5.1', 'ignore': False},
-            5: {'name': 'development/10', 'ignore': False}
+            5: {'name': 'development/10.0', 'ignore': False}
         })
         tags = ['4.3.16', '4.3.18', '5.1.3', '5.1.7']
         fixver = ['5.1.9', '10.0.0']

bert_e/tests/unit/test_sorted.py

@@ -74,10 +74,10 @@ def test_compare_branches_major_only_vs_major_minor():
 def test_compare_branches_major_minor_micro_vs_major_minor():
     branch1 = ((4, 3, 2),)
     branch2 = ((4, 3),)
-    assert compare_branches(branch1, branch2) == -997
+    assert compare_branches(branch1, branch2) == -1
 
 
 def test_compare_branches_major_minor_vs_major_minor_micro():
     branch1 = ((4, 3),)
     branch2 = ((4, 3, 2),)
-    assert compare_branches(branch1, branch2) == 997
+    assert compare_branches(branch1, branch2) == 1

bert_e/workflow/gitwaterflow/branches.py

@@ -63,24 +63,38 @@ def compare_branches(branch1, branch2):
         return -1
 
     # Both are major.minor or longer - compare normally
-    minor1 = version1[1] if len(version1) > 1 else 999
-    minor2 = version2[1] if len(version2) > 1 else 999
-
-    # Compare minor versions
-    if minor1 != minor2:
-        return minor1 - minor2
-
-    # Same major.minor - extract micro versions
-    # Default to 0 if no micro
-    micro1 = version1[2] if len(version1) > 2 else 999
-    # Default to 0 if no micro
-    micro2 = version2[2] if len(version2) > 2 else 999
-
-    # Compare micro versions
-    if micro1 != micro2:
-        return micro1 - micro2
-    else:
-        return 0
+    # Handle cases where one version has missing components
+    len1 = len(version1)
+    len2 = len(version2)
+    
+    # Compare minor versions if both exist
+    if len1 > 1 and len2 > 1:
+        minor1 = version1[1]
+        minor2 = version2[1]
+        if minor1 != minor2:
+            return minor1 - minor2
+    elif len1 > 1 and len2 == 1:
+        # version1 has minor, version2 doesn't -> version1 comes first
+        return -1
+    elif len1 == 1 and len2 > 1:
+        # version2 has minor, version1 doesn't -> version2 comes first
+        return 1
+    # Both have same length (1) -> major versions already compared above
+
+    # Same major.minor - compare micro versions if both exist
+    if len1 > 2 and len2 > 2:
+        micro1 = version1[2]
+        micro2 = version2[2]
+        if micro1 != micro2:
+            return micro1 - micro2
+    elif len1 > 2 and len2 <= 2:
+        # version1 has micro, version2 doesn't -> version1 comes first
+        return -1
+    elif len1 <= 2 and len2 > 2:
+        # version2 has micro, version1 doesn't -> version2 comes first
+        return 1
+    
+    return 0
 
 
 def compare_queues(version1, version2):