Fixes #37187 - Update ACS refresh Pulp fixtures + fix repository_test…

… test
Katello · Feb 28, 2024 · 99c7857 · 99c7857
1 parent 72394b6
commit 99c7857
Show file tree

Hide file tree

Showing 7 changed files with 2,914 additions and 2,340 deletions.
diff --git a/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb b/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb
@@ -7,7 +7,7 @@ class AlternateContentSourceRefreshTest < ActiveSupport::TestCase
     def setup
       @primary = SmartProxy.pulp_primary
       @yum_acs = katello_alternate_content_sources(:yum_alternate_content_source)
-      @yum_acs.subpaths = ['rpm-zchunk/', 'rpm-with-modules/']
+      @yum_acs.subpaths = ['rpm-with-sha-512/', 'rpm-with-modules/']
       @yum_acs.ssl_ca_cert_id = nil
       @yum_acs.ssl_client_cert_id = nil
       @yum_acs.ssl_client_key_id = nil
@@ -28,22 +28,22 @@ def setup
     end
 
     def teardown
-      @yum_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @yum_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @file_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @file_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @yum_simplified_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @yum_simplified_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @file_simplified_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @file_simplified_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end