From 49ff8fdbb27cece0d10a85fb85a417bfae4ed03b Mon Sep 17 00:00:00 2001
From: Robert Bikar <rbikar@redhat.com>
Date: Wed, 1 Sep 2021 09:32:01 +0200
Subject: [PATCH] Fix unstable test

Fixes test that relied on ordering after calling
_keep_n_latest_rpms(). When using more arches
in rpms, kept latest rpms might be in random order
which is perfectly fine for ubipop. So let's make
the test test_keep_n_latest_rpms_multiple_arches()
stable.

Also adding and fixing a bunch of comment in tests.
---
 tests/test_matcher.py | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/tests/test_matcher.py b/tests/test_matcher.py
index ff9e34e..abc2c7c 100644
--- a/tests/test_matcher.py
+++ b/tests/test_matcher.py
@@ -668,8 +668,7 @@ def test_parse_blacklist_config(ubi_config):
 
 
 def test_keep_n_latest_rpms():
-
-    """Test keeping only the latest version of modulemd"""
+    """Test keeping only the latest version of rpm"""
     unit_1 = UbiUnit(
         RpmUnit(
             name="test",
@@ -695,15 +694,15 @@ def test_keep_n_latest_rpms():
     rpms.sort(key=vercmp_sort())
     matcher._keep_n_latest_rpms(rpms)
 
-    # there should only one modulemd
+    # there should only one rpm
     assert len(rpms) == 1
     # with the highest number of version
     assert rpms[0].version == "11"
 
 
 def test_keep_n_latest_rpms_multiple_arches():
+    """Test keeping only the latest version of rpm for multiple arches"""
 
-    """Test keeping only the latest version of modulemd"""
     unit_1 = UbiUnit(
         RpmUnit(
             name="test",
@@ -713,7 +712,6 @@ def test_keep_n_latest_rpms_multiple_arches():
         ),
         None,
     )
-
     unit_2 = UbiUnit(
         RpmUnit(
             name="test",
@@ -732,21 +730,34 @@ def test_keep_n_latest_rpms_multiple_arches():
         ),
         None,
     )
+    unit_4 = UbiUnit(
+        RpmUnit(
+            name="test",
+            version="9",
+            release="20",
+            arch="i686",
+        ),
+        None,
+    )
 
     matcher = RpmMatcher(None, None)
-    rpms = [unit_1, unit_2, unit_3]
+    rpms = [unit_1, unit_2, unit_3, unit_4]
     rpms.sort(key=vercmp_sort())
     matcher._keep_n_latest_rpms(rpms)
 
-    # there should only one modulemd
+    # sort by version, the order after _keep_n_latest_rpms() is not guaranteed in this case
+    rpms.sort(key=lambda x: x.version)
+
+    # there should be 2 rpms
     assert len(rpms) == 2
-    # with the highest number of version
-    assert rpms[0].version == "11"
-    assert rpms[0].arch == "x86_64"
 
-    # with the highest number of version
-    assert rpms[1].version == "10"
-    assert rpms[1].arch == "i686"
+    # i686 gpes with its highest version
+    assert rpms[0].version == "10"
+    assert rpms[0].arch == "i686"
+
+    # x86_64 rpm goes with its highest version
+    assert rpms[1].version == "11"
+    assert rpms[1].arch == "x86_64"
 
 
 def test_get_rpm_output_set(ubi_config):