foreman_rh_cloud 13.2.9 → 14.0.1

data/test/jobs/inventory_full_sync_test.rb

@@ -5,7 +5,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   include Dynflow::Testing::Factories
   include MockCerts
   include KatelloCVEHelper
-  include CandlepinIsolation
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -28,7 +27,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
-    @host1.subscription_facet.pools << pool
+    @host1.organization.pools << pool
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host2 = FactoryBot.create(
@@ -40,7 +39,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
@@ -53,8 +51,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host3.subscription_facet.pools << pool
-
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -89,7 +85,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -140,7 +136,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -193,7 +189,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
                 "system_purpose_sla": "",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.1",
                 "organization_id": 1,
@@ -314,215 +310,4 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
   end
-
-  test 'user-omitted hosts get USER_OMITTED status' do
-    # Add parameter to exclude host1
-    @host1.host_parameters << HostParameter.create(
-      name: 'host_registration_insights_inventory',
-      value: 'false',
-      parameter_type: 'boolean'
-    )
-    @host1.save!
-
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
-
-    @host1.reload
-    @host2.reload
-
-    # Host1 should be USER_OMITTED
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED,
-      InventorySync::InventoryStatus.where(host_id: @host1.id).first.status,
-      'Host with host_registration_insights_inventory=false should have USER_OMITTED status'
-
-    # Host2 should be SYNC
-    assert_equal InventorySync::InventoryStatus::SYNC,
-      InventorySync::InventoryStatus.where(host_id: @host2.id).first.status,
-      'Normal host should have SYNC status'
-  end
-
-  test 'user-omitted hosts are not marked as disconnected' do
-    # Add parameter to exclude host1
-    @host1.host_parameters << HostParameter.create(
-      name: 'host_registration_insights_inventory',
-      value: 'false',
-      parameter_type: 'boolean'
-    )
-    @host1.save!
-
-    # Host1 is not in the cloud inventory response
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
-
-    @host1.reload
-
-    # Host1 should be USER_OMITTED, not DISCONNECT
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED,
-      InventorySync::InventoryStatus.where(host_id: @host1.id).first.status,
-      'User-omitted host should have USER_OMITTED status even if not in cloud inventory'
-  end
-
-  test 'host_statuses output includes all three counts' do
-    # Create a mix of hosts with different statuses
-    # Host1: will be user-omitted
-    @host1.host_parameters << HostParameter.create(
-      name: 'host_registration_insights_inventory',
-      value: 'false',
-      parameter_type: 'boolean'
-    )
-    @host1.save!
-
-    # Host2: will be synced (in cloud inventory)
-    # Host3: will be disconnected (not in cloud inventory)
-
-    # Create inventory response with only host2 (exclude host1 and host3)
-    inventory_with_host2_only = @inventory.dup
-    inventory_with_host2_only['results'] = [@inventory['results'][0]] # Only host2
-    inventory_with_host2_only['total'] = 1
-    inventory_with_host2_only['count'] = 1
-
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(inventory_with_host2_only)
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id, @host3.id])
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
-
-    # Verify the statuses were actually set correctly
-    @host1.reload
-    @host2.reload
-    @host3.reload
-
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED,
-      InventorySync::InventoryStatus.where(host_id: @host1.id).first.status,
-      'Host with host_registration_insights_inventory=false should have USER_OMITTED status'
-    assert_equal InventorySync::InventoryStatus::SYNC,
-      InventorySync::InventoryStatus.where(host_id: @host2.id).first.status,
-      'Host in cloud inventory should have SYNC status'
-    assert_equal InventorySync::InventoryStatus::DISCONNECT,
-      InventorySync::InventoryStatus.where(host_id: @host3.id).first.status,
-      'Host not in cloud inventory and not user-omitted should have DISCONNECT status'
-  end
-
-  test 'user-omitted status respects parameter inheritance from hostgroup' do
-    # Create a hostgroup and assign it to host1
-    hostgroup = FactoryBot.create(:hostgroup)
-    hostgroup.organizations << @host1.organization
-    @host1.hostgroup = hostgroup
-    @host1.save!
-
-    # Set parameter at hostgroup level, not directly on host
-    # This verifies the fix that uses search_for instead of querying HostParameter directly
-    hostgroup.group_parameters << GroupParameter.create(
-      name: 'host_registration_insights_inventory',
-      value: 'false',
-      key_type: 'boolean'
-    )
-    hostgroup.save!
-
-    # Verify parameter is inherited (not set directly on host)
-    assert_nil @host1.parameters.find_by(name: 'host_registration_insights_inventory'),
-      'Test setup: parameter should not be set directly on host'
-    refute ::Foreman::Cast.to_bool(@host1.host_param('host_registration_insights_inventory')),
-      'Test setup: parameter should be inherited from hostgroup'
-
-    # Host2 remains normal (no parameter)
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
-
-    @host1.reload
-    @host2.reload
-
-    # Host1 should be USER_OMITTED (inherited parameter from hostgroup)
-    host1_status = InventorySync::InventoryStatus.where(host_id: @host1.id).first
-    assert_not_nil host1_status, 'Host1 should have an inventory status'
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED, host1_status.status,
-      'Host with inherited host_registration_insights_inventory=false should have USER_OMITTED status'
-
-    # Host2 should be SYNC
-    assert_equal InventorySync::InventoryStatus::SYNC,
-      InventorySync::InventoryStatus.where(host_id: @host2.id).first.status,
-      'Normal host should have SYNC status'
-  end
-
-  test 'user-omitted statuses are cleared before re-creating them to avoid silent create failures' do
-    # First sync: host1 is user-omitted
-    @host1.host_parameters << HostParameter.create(
-      name: 'host_registration_insights_inventory',
-      value: 'false',
-      parameter_type: 'boolean'
-    )
-    @host1.save!
-
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory).twice
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id]).twice
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    # Run first sync
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
-
-    @host1.reload
-    initial_status = InventorySync::InventoryStatus.where(host_id: @host1.id).first
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED, initial_status.status,
-      'Initial sync: host should be USER_OMITTED'
-    initial_status_id = initial_status.id
-
-    # Verify there's only one status record for host1
-    assert_equal 1, InventorySync::InventoryStatus.where(host_id: @host1.id).count,
-      'Should have exactly one status record after first sync'
-
-    # Run second sync (parameter still false)
-    # Without clearing old user_omitted statuses, the .create would silently fail
-    # with 'Host has already been taken' due to uniqueness constraint
-    setup_certs_expectation do
-      InventorySync::Async::InventoryFullSync.any_instance.stubs(:candlepin_id_cert)
-    end
-
-    action2 = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action2)
-
-    @host1.reload
-    final_status = InventorySync::InventoryStatus.where(host_id: @host1.id).first
-
-    # Verify status is still USER_OMITTED (not stale from first sync)
-    assert_equal InventorySync::InventoryStatus::USER_OMITTED, final_status.status,
-      'Status should be USER_OMITTED after second sync'
-
-    # Verify there's still only one status record (old one was deleted before creating new one)
-    assert_equal 1, InventorySync::InventoryStatus.where(host_id: @host1.id).count,
-      'Should have exactly one status record (old cleared before new created)'
-
-    # Verify the old status record was actually deleted and replaced with a new one
-    refute InventorySync::InventoryStatus.exists?(initial_status_id),
-      'Old status record should have been deleted before creating new one'
-    assert_not_equal initial_status_id, final_status.id,
-      'New status record should have different ID, proving old was deleted'
-  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -23,7 +23,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
-    @host1.subscription_facet.pools << pool
+    @host1.organization.pools << pool
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host2 = FactoryBot.create(
@@ -34,8 +34,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       lifecycle_environment: env,
       organization: env.organization
     )
-
-    @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
@@ -71,7 +69,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -122,7 +120,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -173,7 +171,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -226,7 +224,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
                 "system_purpose_sla": "",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.1",
                 "organization_id": 1,

data/test/jobs/inventory_self_host_sync_test.rb

@@ -53,7 +53,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,

data/test/models/insights_client_report_status_test.rb

@@ -72,113 +72,4 @@ class InsightsClientReportStatusTest < ActiveSupport::TestCase
 
     assert_equal HostStatus::Global::ERROR, @host.global_status
   end
-
-  test 'host with host_registration_insights parameter set to false gets USER_OMITTED status' do
-    @host.host_parameters << HostParameter.create(
-      name: 'host_registration_insights',
-      value: 'false',
-      parameter_type: 'boolean'
-    )
-    @host.save!
-
-    insights_status = @host.get_status(InsightsClientReportStatus)
-    insights_status.refresh!
-
-    assert_equal InsightsClientReportStatus::USER_OMITTED, insights_status.status
-    assert_equal HostStatus::Global::OK, insights_status.to_global
-  end
-
-  test 'USER_OMITTED status has correct label' do
-    insights_status = @host.get_status(InsightsClientReportStatus)
-    insights_status.status = InsightsClientReportStatus::USER_OMITTED
-    insights_status.save!
-
-    label = insights_status.to_label
-    assert_match(/host_registration_insights/, label)
-    assert_match(/false/, label)
-  end
-
-  test 'stale scope excludes USER_OMITTED hosts' do
-    host1 = FactoryBot.create(:host, :managed)
-    host2 = FactoryBot.create(:host, :managed)
-    host3 = FactoryBot.create(:host, :managed)
-
-    # Host 1: USER_OMITTED with old reported_at (should NOT be in stale scope)
-    status1 = host1.get_status(InsightsClientReportStatus)
-    status1.status = InsightsClientReportStatus::USER_OMITTED
-    status1.reported_at = Time.zone.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day
-    status1.save!
-
-    # Host 2: REPORTING with old reported_at (should be in stale scope)
-    status2 = host2.get_status(InsightsClientReportStatus)
-    status2.status = InsightsClientReportStatus::REPORTING
-    status2.reported_at = Time.zone.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day
-    status2.save!
-
-    # Host 3: NO_REPORT with old reported_at (should be in stale scope)
-    status3 = host3.get_status(InsightsClientReportStatus)
-    status3.status = InsightsClientReportStatus::NO_REPORT
-    status3.reported_at = Time.zone.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day
-    status3.save!
-
-    stale_statuses = InsightsClientReportStatus.stale
-    stale_host_ids = stale_statuses.pluck(:host_id)
-
-    assert_not_includes stale_host_ids, host1.id, 'USER_OMITTED host should not be in stale scope'
-    assert_includes stale_host_ids, host2.id, 'REPORTING host with old report should be in stale scope'
-    assert_includes stale_host_ids, host3.id, 'NO_REPORT host with old report should be in stale scope'
-  end
-
-  test 'USER_OMITTED status respects parameter inheritance from hostgroup' do
-    # Create a hostgroup with parameter = false
-    hostgroup = FactoryBot.create(:hostgroup)
-    hostgroup.group_parameters << GroupParameter.create(
-      name: 'host_registration_insights',
-      value: 'false',
-      key_type: 'boolean'
-    )
-    hostgroup.save!
-
-    @host.hostgroup = hostgroup
-    @host.save!
-
-    # Verify parameter is inherited (not set directly on host)
-    assert_nil @host.parameters.find_by(name: 'host_registration_insights'),
-      'Test setup: parameter should not be set directly on host'
-
-    insights_status = @host.get_status(InsightsClientReportStatus)
-    insights_status.refresh!
-
-    assert_equal InsightsClientReportStatus::USER_OMITTED, insights_status.status,
-      'Status should be USER_OMITTED when host_registration_insights=false is inherited from hostgroup'
-    assert_equal HostStatus::Global::OK, insights_status.to_global,
-      'USER_OMITTED status should not affect global status'
-  end
-
-  test 'host parameter overrides inherited parameter from hostgroup' do
-    # Create a hostgroup with parameter = false
-    hostgroup = FactoryBot.create(:hostgroup)
-    hostgroup.group_parameters << GroupParameter.create(
-      name: 'host_registration_insights',
-      value: 'false',
-      key_type: 'boolean'
-    )
-    hostgroup.save!
-
-    @host.hostgroup = hostgroup
-
-    # Override with host parameter = true
-    @host.host_parameters << HostParameter.create(
-      name: 'host_registration_insights',
-      value: 'true',
-      parameter_type: 'boolean'
-    )
-    @host.save!
-
-    insights_status = @host.get_status(InsightsClientReportStatus)
-    insights_status.refresh!
-
-    assert_not_equal InsightsClientReportStatus::USER_OMITTED, insights_status.status,
-      'Status should not be USER_OMITTED when host parameter overrides hostgroup parameter with true'
-  end
 end

data/test/unit/archived_report_generator_test.rb

@@ -18,7 +18,7 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
   end
 
   def interesting_facts
@@ -51,7 +51,6 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
     test_org = FactoryBot.create(:organization)
 
     ForemanInventoryUpload::Generators::Queries.expects(:for_org).with(test_org.id, hosts_query: '').returns(batches)
-    ForemanInventoryUpload::Generators::Slice.any_instance.stubs(:golden_ticket?).returns(false)
     Dir.mktmpdir do |tmpdir|
       target = File.join(tmpdir, 'test.tar.gz')
       generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))

data/test/unit/fact_helpers_test.rb

@@ -12,22 +12,6 @@ class FactHelpersTest < ActiveSupport::TestCase
     @org = FactoryBot.create(:organization)
   end
 
-  test 'golden_ticket uses golden_ticket method when defined' do
-    @org.expects(:golden_ticket?).returns(true)
-
-    actual = @instance.golden_ticket?(@org)
-
-    assert actual
-  end
-
-  test 'golden_ticket uses content_access_mode method when golden_ticket not defined' do
-    @org.expects(:content_access_mode).returns('org_environment')
-
-    actual = @instance.golden_ticket?(@org)
-
-    assert actual
-  end
-
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
     @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(

data/test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb

@@ -5,17 +5,19 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
-    @organization = FactoryBot.create(:organization)
-    # Create a simple repository - we only need id and organization_id for the action
-    @repo = ::Katello::Repository.new(id: 1)
-    @repo.stubs(:organization_id).returns(@organization.id)
-    ::Katello::Repository.stubs(:find).with(1).returns(@repo)
-
+    @root = FactoryBot.build(:katello_root_repository, :fedora_17_x86_64_dev_root)
+    @root.save(validate: false)
+    @repo = FactoryBot.create(
+      :katello_repository,
+      :with_product,
+      distribution_family: 'Red Hat',
+      distribution_version: '7.5',
+      root: @root
+    )
     @repo_payload = { id: @repo.id }
     @expected_url = 'https://example.com/api/v1/vmaas/reposcan/sync'
     InsightsCloud.stubs(:vmaas_reposcan_sync_url).returns(@expected_url)
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-    Organization.stubs(:find).with(@organization.id).returns(@organization)
   end
 
   teardown do
@@ -81,7 +83,7 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
         params[:url] == @expected_url &&
         params[:headers].is_a?(Hash) &&
         params[:headers]['Content-Type'] == 'application/json' &&
-        params[:organization] == @organization
+        params[:organization] == @repo.organization
     end
                                            .returns(mock_response)
 
@@ -114,94 +116,37 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
                                            .stubs(:execute_cloud_request)
                                            .raises(exception)
 
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
+    error = assert_raises(ForemanTasks::TaskError) do
+      ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
+    end
 
-    assert_equal 'VMaaS reposcan sync failed: 500 - Server Error', task.output[:message]
+    assert_equal 'VMaaS reposcan sync failed: 500 - Server Error', error.task.output[:message]
   end
 
   test 'run sets error message in task output for StandardError exception' do
-    mock_logger = mock('logger')
-    mock_logger.expects(:error).with('Error triggering VMaaS reposcan sync: Network timeout')
-    InsightsCloud::Async::VmaasReposcanSync.any_instance.stubs(:logger).returns(mock_logger)
-
     InsightsCloud::Async::VmaasReposcanSync.any_instance
                                            .stubs(:execute_cloud_request)
                                            .raises(StandardError.new('Network timeout'))
 
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
-
-    assert_equal 'Error triggering VMaaS reposcan sync: Network timeout', task.output[:message]
-  end
-
-  test 'run logs and handles error response without raising' do
-    error_response = mock('error_response')
-    error_response.stubs(:code).returns(500)
-    error_response.stubs(:body).returns('error')
-    exception = RestClient::ExceptionWithResponse.new(error_response)
-
-    InsightsCloud::Async::VmaasReposcanSync.any_instance
-                                           .stubs(:execute_cloud_request)
-                                           .raises(exception)
-
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
-
-    assert_equal 'VMaaS reposcan sync failed: 500 - error', task.output[:message]
-  end
-
-  test 'run handles 429 error with warning log level' do
-    error_response = mock('error_response')
-    error_response.stubs(:code).returns(429)
-    error_response.stubs(:body).returns('{"msg": "Another task already in progress"}')
-    exception = RestClient::ExceptionWithResponse.new(error_response)
-
-    mock_logger = mock('logger')
-    mock_logger.expects(:warn).with('VMaaS reposcan sync skipped: another sync already in progress (429)')
-    InsightsCloud::Async::VmaasReposcanSync.any_instance.stubs(:logger).returns(mock_logger)
-
-    InsightsCloud::Async::VmaasReposcanSync.any_instance
-                                           .stubs(:execute_cloud_request)
-                                           .raises(exception)
-
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
+    error = assert_raises(ForemanTasks::TaskError) do
+      ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
+    end
 
-    assert_equal 'VMaaS reposcan sync skipped: another sync already in progress (429)',
-      task.output[:message]
+    # The task is available via main_action
+    assert_match(/Error triggering VMaaS reposcan sync: Network timeout, response: /,
+      error.task.main_action.output[:message])
   end
 
-  test 'run handles non-429 errors with error log level' do
-    error_response = mock('error_response')
-    error_response.stubs(:code).returns(500)
-    error_response.stubs(:body).returns('Internal Server Error')
+  test 'run logs and re-raises when cloud request returns error response' do
+    error_response = mock('error_response', code: 500, body: 'error')
     exception = RestClient::ExceptionWithResponse.new(error_response)
 
-    mock_logger = mock('logger')
-    mock_logger.expects(:error).with('VMaaS reposcan sync failed: 500 - Internal Server Error')
-    InsightsCloud::Async::VmaasReposcanSync.any_instance.stubs(:logger).returns(mock_logger)
-
     InsightsCloud::Async::VmaasReposcanSync.any_instance
                                            .stubs(:execute_cloud_request)
                                            .raises(exception)
 
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
-
-    assert_equal 'VMaaS reposcan sync failed: 500 - Internal Server Error',
-      task.output[:message]
-  end
-
-  test 'run handles RestClient::ExceptionWithResponse with nil response' do
-    exception = RestClient::ExceptionWithResponse.new(nil)
-
-    mock_logger = mock('logger')
-    mock_logger.expects(:error).with('VMaaS reposcan sync failed:  - ')
-    InsightsCloud::Async::VmaasReposcanSync.any_instance.stubs(:logger).returns(mock_logger)
-
-    InsightsCloud::Async::VmaasReposcanSync.any_instance
-                                           .stubs(:execute_cloud_request)
-                                           .raises(exception)
-
-    task = ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
-
-    refute_nil task.output[:message]
-    assert_equal 'VMaaS reposcan sync failed:  - ', task.output[:message]
+    assert_raises(ForemanTasks::TaskError) do
+      ForemanTasks.sync_task(InsightsCloud::Async::VmaasReposcanSync, @repo_payload)
+    end
   end
 end