Fixes #33430 - do not error on pulpcore with 1 worker

Katello · Sep 7, 2021 · 770894c · 770894c
1 parent 0eda431
commit 770894c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/app/models/katello/ping.rb b/app/models/katello/ping.rb
@@ -195,10 +195,7 @@ def pulp3_without_auth(url)
         end
 
         workers = json["online_workers"] || []
-
-        unless workers.count > 1
-          fail _("Not all necessary pulp workers running at %s.") % url
-        end
+        fail _("Not all necessary pulp workers running at %s.") % url if workers.empty?
 
         json
       end

diff --git a/test/models/ping_test.rb b/test/models/ping_test.rb
@@ -230,17 +230,10 @@ def test_failure_on_all_workers_empty
                           }, /Not all necessary pulp workers running/)
     end
 
-    def test_failure_on_no_resource_manager
-      run_exception_test({ "database_connection" => {"connected" => true},
-                           "redis_connection" => {"connected" => true},
-                           "online_workers" => [{"name" => "reserved_resource_worker-1"}]
-                          }, /Not all necessary pulp workers running/)
-    end
-
     def test_failure_on_no_reserved_resource_worker
       run_exception_test({ "database_connection" => {"connected" => true},
                            "redis_connection" => {"connected" => true},
-                           "online_workers" => [{"name" => "resource_manager"}]
+                           "online_workers" => []
                           }, /Not all necessary pulp workers running/)
     end