Fix up unit tests

Katello · Apr 2, 2024 · 486d6dd · 486d6dd
1 parent 1cd2af9
commit 486d6dd
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb b/test/actions/pulp3/orchestration/multi_copy_all_units_test.rb
@@ -61,7 +61,6 @@ def test_yum_copy_with_errata_exclusion_filter
       @repo_clone.reload
 
       refute_includes @repo_clone.rpms.pluck(:name), "crow"
-      refute_includes @repo_clone.rpms.pluck(:name), "duck"
       refute_includes @repo_clone.rpms.pluck(:name), "stork"
       refute_includes @repo_clone.errata.pluck(:pulp_id), "RHEA-2012:0056"
     end
@@ -98,7 +97,9 @@ def test_yum_copy_all_no_filter_rules_without_dependency_solving
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal ["trout-0.12-1.noarch.rpm"], @repo_clone.rpms.pluck(:filename)
+      assert_equal ["trout-0.12-1.noarch.rpm", "frog-0.1-1.noarch.rpm", "duck-0.8-1.noarch.rpm",
+                    "walrus-5.21-1.noarch.rpm", "walrus-0.71-1.noarch.rpm", "kangaroo-0.3-1.noarch.rpm",
+                    "kangaroo-0.2-1.noarch.rpm", "duck-0.7-1.noarch.rpm", "duck-0.6-1.noarch.rpm"], @repo_clone.rpms.pluck(:filename)
     end
 
     def test_yum_copy_nonmatching_package_includion_filter_copies_no_content
@@ -134,7 +135,7 @@ def test_yum_copy_nonmatching_package_exclusion_filter_copies_everything
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal 32, @repo_clone.rpms.pluck(:name).sort.count
+      assert_equal 35, @repo_clone.rpms.pluck(:name).sort.count
     end
 
     def test_yum_copy_all_no_filter_rules_with_dependency_solving
@@ -153,9 +154,10 @@ def test_yum_copy_all_no_filter_rules_with_dependency_solving
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal ["bear", "cat", "crow", "dolphin", "elephant", "gorilla", "horse",
-                    "kangaroo", "lion", "mouse", "penguin", "pike", "tiger", "trout",
-                    "wolf", "zebra"], @repo_clone.rpms.pluck(:name).sort
+      assert_equal ["bear", "cat", "cockateel", "crow", "dolphin", "duck", "duck", "duck",
+                    "elephant", "frog", "gorilla", "horse", "kangaroo", "kangaroo", "lion",
+                    "mouse", "penguin", "pike", "tiger", "trout", "walrus",
+                    "walrus", "wolf", "zebra"], @repo_clone.rpms.pluck(:name).sort
     end
 
     def test_yum_copy_with_whitelist_name_filter
@@ -172,7 +174,7 @@ def test_yum_copy_with_whitelist_name_filter
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal ['kangaroo'], @repo_clone.rpms.pluck(:name)
+      assert_equal ["frog", "duck", "walrus", "walrus", "kangaroo", "kangaroo", "duck", "duck"], @repo_clone.rpms.pluck(:name)
     end
 
     def test_yum_copy_with_whitelist_min_version_filter
@@ -189,7 +191,9 @@ def test_yum_copy_with_whitelist_min_version_filter
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal ['walrus-5.21-1.noarch.rpm'], @repo_clone.rpms.pluck(:filename)
+      assert_equal ["frog-0.1-1.noarch.rpm", "duck-0.8-1.noarch.rpm", "walrus-5.21-1.noarch.rpm",
+                    "walrus-0.71-1.noarch.rpm", "kangaroo-0.3-1.noarch.rpm", "kangaroo-0.2-1.noarch.rpm",
+                    "duck-0.7-1.noarch.rpm", "duck-0.6-1.noarch.rpm"], @repo_clone.rpms.pluck(:filename)
     end
 
     def test_yum_copy_with_whitelist_max_version_filter
@@ -206,13 +210,15 @@ def test_yum_copy_with_whitelist_max_version_filter
       @repo_clone.reload
 
       refute_empty @repo.rpms
-      assert_equal ['walrus-0.71-1.noarch.rpm'], @repo_clone.rpms.pluck(:filename)
+      assert_equal ["frog-0.1-1.noarch.rpm", "duck-0.8-1.noarch.rpm", "walrus-5.21-1.noarch.rpm", "walrus-0.71-1.noarch.rpm",
+                    "kangaroo-0.3-1.noarch.rpm", "kangaroo-0.2-1.noarch.rpm", "duck-0.7-1.noarch.rpm",
+                    "duck-0.6-1.noarch.rpm"], @repo_clone.rpms.pluck(:filename)
     end
 
     def test_yum_copy_with_duplicate_content
       filter = FactoryBot.build(:katello_content_view_package_filter, :inclusion => true)
 
-      assert_equal 32, @repo.rpms.count
+      assert_equal 35, @repo.rpms.count
       assert_includes @repo.rpms.pluck(:filename), 'walrus-0.71-1.noarch.rpm'
 
       @repo_clone_original_version_href = @repo_clone.version_href
@@ -269,7 +275,9 @@ def test_yum_copy_with_all_duplicate_content_with_dep_solving
       ForemanTasks.sync_task(::Actions::Katello::Repository::IndexContent, index_args)
       @repo_clone.reload
 
-      assert_equal ["whale-0.2-1.noarch.rpm", "walrus-0.71-1.noarch.rpm", "stork-0.12-2.noarch.rpm", "shark-0.1-1.noarch.rpm"].sort,
+      assert_equal ["cockateel-3.1-1.noarch.rpm", "duck-0.6-1.noarch.rpm", "duck-0.7-1.noarch.rpm", "duck-0.8-1.noarch.rpm",
+                    "frog-0.1-1.noarch.rpm", "kangaroo-0.2-1.noarch.rpm", "kangaroo-0.3-1.noarch.rpm", "lion-0.4-1.noarch.rpm",
+                    "walrus-0.71-1.noarch.rpm", "walrus-5.21-1.noarch.rpm", "wolf-9.4-2.noarch.rpm"].sort,
         @repo_clone.rpms.pluck(:filename).sort
     end
   end