Clarify which of the candidates is the right one - removing assert

lib/tree_builder.py

@@ -118,8 +118,9 @@ class TreeBuilder:
                 candidates = []
             node = node.parent
         if candidates:
-            # the assert is here to see if we have more hot cases
-            assert len(candidates) == 1
+            # the first candidate is the youngest one that matches the check. That's
+            # good enough. See FastCGI test case for rev 36 and 38: 37 reverted 36 and
+            # then 38 reverting the revert before it was submitted.
             return candidates[0]
 
     def add_merge_points(self, factory_revisions):

tests/fixtures/FastCGI-expected-list.yaml

@@ -0,0 +1,33 @@
+- factory c:openSUSE:Factory/FastCGI/29.0 p1:openSUSE:Factory/FastCGI/28.0 p2:devel:libraries:c_c++/FastCGI/40.0
+- devel c:devel:libraries:c_c++/FastCGI/40.0 p1:devel:libraries:c_c++/FastCGI/38.0
+- factory c:openSUSE:Factory/FastCGI/28.0 p1:openSUSE:Factory/FastCGI/27.0 p2:devel:libraries:c_c++/FastCGI/38.0
+- devel c:devel:libraries:c_c++/FastCGI/38.0 p1:devel:libraries:c_c++/FastCGI/37.0
+- devel c:devel:libraries:c_c++/FastCGI/37.0 p1:devel:libraries:c_c++/FastCGI/36.0
+- devel c:devel:libraries:c_c++/FastCGI/36.0 p1:devel:libraries:c_c++/FastCGI/34.0
+- factory c:openSUSE:Factory/FastCGI/27.0 p1:openSUSE:Factory/FastCGI/26.0 p2:devel:libraries:c_c++/FastCGI/34.0
+- devel c:devel:libraries:c_c++/FastCGI/34.0 p1:devel:libraries:c_c++/FastCGI/32.0
+- factory c:openSUSE:Factory/FastCGI/26.0 p1:openSUSE:Factory/FastCGI/23.0 p2:devel:libraries:c_c++/FastCGI/32.0
+- devel c:devel:libraries:c_c++/FastCGI/32.0 p1:devel:libraries:c_c++/FastCGI/30.0
+- factory c:openSUSE:Factory/FastCGI/23.0 p1:openSUSE:Factory/FastCGI/20.0 p2:devel:libraries:c_c++/FastCGI/30.0
+- devel c:devel:libraries:c_c++/FastCGI/30.0 p1:devel:libraries:c_c++/FastCGI/28.0
+- factory c:openSUSE:Factory/FastCGI/20.0 p1:openSUSE:Factory/FastCGI/19.0 p2:devel:libraries:c_c++/FastCGI/28.0
+- devel c:devel:libraries:c_c++/FastCGI/28.0 p1:devel:libraries:c_c++/FastCGI/26.0
+- factory c:openSUSE:Factory/FastCGI/19.0 p1:openSUSE:Factory/FastCGI/18.0 p2:devel:libraries:c_c++/FastCGI/26.0
+- devel c:devel:libraries:c_c++/FastCGI/26.0 p1:devel:libraries:c_c++/FastCGI/24.0
+- factory c:openSUSE:Factory/FastCGI/18.0 p1:openSUSE:Factory/FastCGI/16.0 p2:devel:libraries:c_c++/FastCGI/24.0
+- devel c:devel:libraries:c_c++/FastCGI/24.0 p1:devel:libraries:c_c++/FastCGI/22.0
+- factory c:openSUSE:Factory/FastCGI/16.0 p1:openSUSE:Factory/FastCGI/15.0 p2:devel:libraries:c_c++/FastCGI/22.0
+- devel c:devel:libraries:c_c++/FastCGI/22.0 p1:devel:libraries:c_c++/FastCGI/20.0
+- factory c:openSUSE:Factory/FastCGI/15.0 p1:openSUSE:Factory/FastCGI/14.0 p2:devel:libraries:c_c++/FastCGI/20.0
+- devel c:devel:libraries:c_c++/FastCGI/20.0 p1:devel:libraries:c_c++/FastCGI/19.014
+- devel c:devel:libraries:c_c++/FastCGI/19.014 p1:devel:libraries:c_c++/FastCGI/18.0
+- factory c:openSUSE:Factory/FastCGI/14.0 p1:openSUSE:Factory/FastCGI/13.0
+- factory c:openSUSE:Factory/FastCGI/13.0 p1:openSUSE:Factory/FastCGI/11.0 p2:devel:libraries:c_c++/FastCGI/18.0
+- devel c:devel:libraries:c_c++/FastCGI/18.0 p1:openSUSE:Factory/FastCGI/11.0
+- factory c:openSUSE:Factory/FastCGI/11.0 p1:openSUSE:Factory/FastCGI/10.0
+- factory c:openSUSE:Factory/FastCGI/10.0 p1:openSUSE:Factory/FastCGI/7.0
+- factory c:openSUSE:Factory/FastCGI/7.0 p1:openSUSE:Factory/FastCGI/6.0
+- factory c:openSUSE:Factory/FastCGI/6.0 p1:openSUSE:Factory/FastCGI/4.0
+- factory c:openSUSE:Factory/FastCGI/4.0 p1:openSUSE:Factory/FastCGI/3.0
+- factory c:openSUSE:Factory/FastCGI/3.0 p1:openSUSE:Factory/FastCGI/1.0
+- factory c:openSUSE:Factory/FastCGI/1.0

tests/fixtures/FastCGI-expected-tree.yaml

@@ -0,0 +1,44 @@
+- commit: openSUSE:Factory/FastCGI/29.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/40.0
+- commit: openSUSE:Factory/FastCGI/28.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/38.0
+  - devel:libraries:c_c++/FastCGI/37.0
+  - devel:libraries:c_c++/FastCGI/36.0
+- commit: openSUSE:Factory/FastCGI/27.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/34.0
+- commit: openSUSE:Factory/FastCGI/26.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/32.0
+- commit: openSUSE:Factory/FastCGI/23.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/30.0
+- commit: openSUSE:Factory/FastCGI/20.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/28.0
+- commit: openSUSE:Factory/FastCGI/19.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/26.0
+- commit: openSUSE:Factory/FastCGI/18.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/24.0
+- commit: openSUSE:Factory/FastCGI/16.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/22.0
+- commit: openSUSE:Factory/FastCGI/15.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/20.0
+  - devel:libraries:c_c++/FastCGI/19.014
+- commit: openSUSE:Factory/FastCGI/14.0
+- commit: openSUSE:Factory/FastCGI/13.0
+  merged:
+  - devel:libraries:c_c++/FastCGI/18.0
+- commit: openSUSE:Factory/FastCGI/11.0
+- commit: openSUSE:Factory/FastCGI/10.0
+- commit: openSUSE:Factory/FastCGI/7.0
+- commit: openSUSE:Factory/FastCGI/6.0
+- commit: openSUSE:Factory/FastCGI/4.0
+- commit: openSUSE:Factory/FastCGI/3.0
+- commit: openSUSE:Factory/FastCGI/1.0

tests/tree_test.py

@@ -71,6 +71,9 @@ class TestTreeMethods(unittest.TestCase):
     def test_firewalld_tree(self):
         self.verify_package("firewalld")
 
+    def test_FastCGI_tree(self):
+        self.verify_package("FastCGI")
+
 
 if __name__ == "__main__":
     unittest.main()