foreman_rh_cloud 12.2.13 → 13.0.0

data/locale/zh_CN/foreman_rh_cloud.po

@@ -9,14 +9,15 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
 # Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
-# Ondřej Gajdušek, 2025
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_rh_cloud 13.0.5\n"
+"Project-Id-Version: foreman_rh_cloud 11.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2023-01-20 13:26+0000\n"
-"Last-Translator: Ondřej Gajdušek, 2025\n"
+"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
+"n.nl>, 2025\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
 "_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -43,9 +44,6 @@ msgstr "高级清单设置"
 msgid "All recommendations are now selected."
 msgstr "现在选择了所有建议。"
 
-msgid "Analytics data collection"
-msgstr "数据收集分析"
-
 msgid "Any Organization"
 msgstr "任意机构"
 
@@ -127,17 +125,11 @@ msgstr "下载最新的报告"
 msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
 msgstr "启用自动删除来自红帽云的主机记录"
 
-msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights."
-msgstr ""
-
 msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
 msgstr "启用来自红帽云的 Insights 建议自动同步"
 
-msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights."
-msgstr ""
-
-msgid "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights."
-msgstr ""
+msgid "Enable automatic upload of your host inventory to the Red Hat cloud"
+msgstr "启用自动将主机清单上传到红帽云"
 
 msgid "Enable automatic upload of your hosts inventory to the Red Hat cloud"
 msgstr "启用自动将主机清单上传到红帽云"
@@ -151,14 +143,17 @@ msgstr "启用清单上传"
 msgid "Encountered an error while trying to access the server:"
 msgstr "在尝试访问服务器时遇到错误："
 
-msgid "Exclude installed packages"
+msgid "Exclude installed Packages"
 msgstr "排除安装的软件包"
 
 msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
 msgstr "将安装的软件包上传到红帽云"
 
-msgid "Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.) Ignored when using local Insights."
-msgstr ""
+msgid "Exclude packages"
+msgstr "排除软件包"
+
+msgid "Exclude packages from being uploaded to the Red Hat cloud"
+msgstr "排除软件包上传到红帽云"
 
 msgid "Exit Code: %s"
 msgstr "退出代码：%s"
@@ -193,9 +188,6 @@ msgstr "全屏"
 msgid "Generate and upload report"
 msgstr "生成并上传报告"
 
-msgid "Generate report"
-msgstr "生成报告"
-
 msgid "Generate the report, but do not upload"
 msgstr "生成报告，但不上传"
 
@@ -223,9 +215,6 @@ msgstr "获取 RH Cloud 中缺少的主机"
 msgid "Host Insights recommendations"
 msgstr "主机 Insights 建议"
 
-msgid "Host inventory report job"
-msgstr ""
-
 msgid "Host was not uploaded to your RH cloud inventory"
 msgstr "主机没有上传到您的 RH 云清单"
 
@@ -268,9 +257,6 @@ msgstr "每页的项"
 msgid "Knowledgebase article"
 msgstr "知识库文章"
 
-msgid "Learn more about {minimalDataCollectionSetting}."
-msgstr "了解有关 {minimalDataCollectionSetting} 的更多信息。"
-
 msgid "List of host UUIDs"
 msgstr "主机 UUID 列表"
 
@@ -286,12 +272,6 @@ msgstr "低"
 msgid "Manual"
 msgstr "手册"
 
-msgid "Minimal data collection"
-msgstr "最小数据收集"
-
-msgid "Missing Insights facets created: %s"
-msgstr ""
-
 msgid "Moderate"
 msgstr "中等"
 
@@ -322,33 +302,21 @@ msgstr "没有同步，此机构没有带有订阅的主机。"
 msgid "Notice"
 msgstr "注意事項"
 
+msgid "Obfuscate IPs"
+msgstr "模糊 IP"
+
 msgid "Obfuscate host ipv4 addresses"
 msgstr "模糊的主机 ipv4 地址"
 
-msgid "Obfuscate host ipv4 addresses."
-msgstr "对主机 ipv4 地址进行模糊化处理"
-
 msgid "Obfuscate host names"
 msgstr "模糊主机名"
 
 msgid "Obfuscate host names sent to the Red Hat cloud"
 msgstr "发送到红帽云的模糊主机名"
 
-msgid "Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.) Ignored when using local Insights."
-msgstr ""
-
 msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
 msgstr "发送到红帽云的模糊 ipv4 地址"
 
-msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.) Ignored when using local Insights."
-msgstr ""
-
-msgid "Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings. Ignored when using local Insights."
-msgstr ""
-
-msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
-msgstr "仅将最低所需的数据发送到红帽云，禁用模糊设置"
-
 msgid "Oops! Couldn't find organization that matches your query"
 msgstr "未找到与您的查询匹配的机构"
 
@@ -364,8 +332,11 @@ msgstr "运行 playbook"
 msgid "RH Cloud"
 msgstr "RH Cloud"
 
-msgid "RHC daemon id. Ignored when using local Insights."
-msgstr ""
+msgid "RHC daemon id"
+msgstr "RHC 守护进程 ID"
+
+msgid "RHCloud"
+msgstr "RHCloud"
 
 msgid "Read more about it in RH cloud insights"
 msgstr "在 RH Cloud insights 中了解更多有关它的信息"
@@ -424,7 +395,7 @@ msgstr "解决方案"
 msgid "Run RH Cloud playbook"
 msgstr "运行 RH Cloud playbook"
 
-msgid "Run playbook generated by Red Hat remediations app"
+msgid "Run playbook genrated by Red Hat remediations app"
 msgstr "运行由红帽补救应用生成的 playbook"
 
 msgid "Run remediation playbook generated by Insights"
@@ -439,17 +410,14 @@ msgstr "用于删除主机的有范围的搜索字符串"
 msgid "Select recommendations from all pages"
 msgstr "在所有页面中选择建议"
 
-msgid "Send additional data to enhance Insights services, as per the settings"
-msgstr "根据设置，发送额外数据以增强 Insights 服务"
-
 msgid "Set the current organization context for the request"
 msgstr "设置请求的当前机构上下文"
 
 msgid "Settings"
 msgstr "设置"
 
-msgid "Should import include parameter tags from Foreman? Ignored when using local Insights."
-msgstr ""
+msgid "Should import include parameter tags from Foreman?"
+msgstr "应从 Foreman 导入包含参数标签？"
 
 msgid "Show Advanced Settings"
 msgstr "显示高级设置"
@@ -457,12 +425,6 @@ msgstr "显示高级设置"
 msgid "Show if system is configured to use local iop-advisor-engine."
 msgstr "显示系统是否被配置为使用本地 iop-advisor-engine。"
 
-msgid "Single-host report job"
-msgstr ""
-
-msgid "Single-host report job for host %s"
-msgstr ""
-
 msgid "Start inventory synchronization"
 msgstr "启动清单同步"
 
@@ -493,8 +455,8 @@ msgstr "Red Hat Hybrid Cloud Console 提供了一组云服务，包括 Red Hat I
 msgid "The report file %{filename} doesn't exist"
 msgstr "报告文件 %{filename} 不存在"
 
-msgid "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy."
-msgstr "调度的进程被禁用，因为此 Foreman 配置了一个本地 IoP Smart Proxy。"
+msgid "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option."
+msgstr "调度的进程被禁用，因为此 Foreman 配置了 use_local_advisor_engine 选项。"
 
 msgid "The server returned the following error: %s"
 msgstr "服务器返回以下错误：%s"
@@ -505,9 +467,6 @@ msgstr "任务失败，错误为:"
 msgid "There are no recommendations for your hosts"
 msgstr "没有适用于您的主机的建议"
 
-msgid "There were no missing Insights facets"
-msgstr ""
-
 msgid "This action will also enable automatic reports upload"
 msgstr "此操作还会启用自动报告上传"
 
@@ -517,9 +476,6 @@ msgstr "要为所有 Foreman 机构启用此报告，请将 {uploadButtonName}
 msgid "To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
 msgstr "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
 
-msgid "Total CVEs"
-msgstr "CVE 总数"
-
 msgid "Total risk"
 msgstr "总风险"
 
@@ -547,12 +503,6 @@ msgstr "查看所有建议"
 msgid "View in Red Hat Insights"
 msgstr "禁用 Red Hat Insights"
 
-msgid "Vulnerabilities"
-msgstr "安全漏洞"
-
-msgid "Vulnerability"
-msgstr "安全漏洞"
-
 msgid "Wait and %s"
 msgstr "等待和 %s"
 
@@ -619,9 +569,6 @@ msgstr "rule id"
 msgid "rule title"
 msgstr "rule 标题"
 
-msgid "setting minimal data collection"
-msgstr "设置最小数据收集"
-
 msgid "solution url"
 msgstr "solution url"
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.2.13",
+  "version": "13.0.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/jobs/cloud_connector_announce_task_test.rb

@@ -4,7 +4,7 @@ require 'foreman_tasks/test_helpers'
 require "#{ForemanTasks::Engine.root}/test/support/dummy_dynflow_action"
 
 class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
     RemoteExecutionFeature.register(
@@ -23,8 +23,7 @@ class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
   test 'It executes cloud presence announcer' do
     ForemanRhCloud::CloudPresence.any_instance.expects(:announce_to_sources).times(Organization.unscoped.count)
 
-    action = create_and_plan_action(InsightsCloud::Async::CloudConnectorAnnounceTask, @job_invocation)
-    finalize_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::CloudConnectorAnnounceTask, @job_invocation)
   end
 
   private

data/test/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -4,7 +4,7 @@ require 'foreman_tasks/test_helpers'
 require "#{ForemanTasks::Engine.root}/test/support/dummy_dynflow_action"
 
 class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   # override default send behavior for the test
   class TestConnectorPlaybookExecutionReporterTask < InsightsCloud::Async::ConnectorPlaybookExecutionReporterTask
@@ -35,19 +35,17 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:job_finished?).returns(true)
 
-    action = create_and_plan_action(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
-    action = run_action(action)
+    actual = ForemanTasks.sync_task(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
 
-    saved_reports = action.output[:saved_reports]
-    actual_report = saved_reports.first.to_s
+    actual_report = actual.output[:saved_reports].first.to_s
 
-    assert_equal 1, saved_reports.size
+    assert_equal 1, actual.output[:saved_reports].size
     assert_not_nil actual_report
     actual_jsonl = read_jsonl(actual_report)
 
-    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
-    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
 
     assert_equal true, @job_invocation.finished?
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
@@ -79,25 +77,20 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     ArrangeTestHost.any_instance.stubs(:job_finished?).returns(false, true)
 
-    action = create_and_plan_action(ArrangeTestHost, @job_invocation)
-    action = run_action(action)
+    actual = ForemanTasks.sync_task(ArrangeTestHost, @job_invocation)
 
-    # Process polling cycles - manually trigger Poll events until done
-    action = run_action(action, Dynflow::Action::Polling::Poll) until action.done?
+    actual_report1 = actual.output[:saved_reports].first.to_s
+    actual_report2 = actual.output[:saved_reports].second.to_s
 
-    saved_reports = action.output[:saved_reports]
-    actual_report1 = saved_reports.first.to_s
-    actual_report2 = saved_reports.second.to_s
-
-    assert_equal 2, saved_reports.size
+    assert_equal 2, actual.output[:saved_reports].size
     assert_not_nil actual_report1
     assert_not_nil actual_report2
 
     actual_json1 = read_jsonl(actual_report1)
     actual_json2 = read_jsonl(actual_report2)
 
-    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
 
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
 
@@ -148,18 +141,13 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     ArrangeTestHostTwo.any_instance.stubs(:job_finished?).returns(false, false, true)
 
-    action = create_and_plan_action(ArrangeTestHostTwo, @job_invocation)
-    action = run_action(action)
-
-    # Process polling cycles - manually trigger Poll events until done
-    action = run_action(action, Dynflow::Action::Polling::Poll) until action.done?
+    actual = ForemanTasks.sync_task(ArrangeTestHostTwo, @job_invocation)
 
-    saved_reports = action.output[:saved_reports]
-    actual_report1 = saved_reports.first.to_s
-    actual_report2 = saved_reports.second.to_s
-    actual_report3 = saved_reports.third.to_s
+    actual_report1 = actual.output[:saved_reports].first.to_s
+    actual_report2 = actual.output[:saved_reports].second.to_s
+    actual_report3 = actual.output[:saved_reports].third.to_s
 
-    assert_equal 3, saved_reports.size
+    assert_equal 3, actual.output[:saved_reports].size
     assert_not_nil actual_report1
     assert_not_nil actual_report2
     assert_not_nil actual_report3
@@ -168,8 +156,8 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     actual_json2 = read_jsonl(actual_report2)
     actual_json3 = read_jsonl(actual_report3)
 
-    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
 
     assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
     assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']

data/test/jobs/exponential_backoff_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class ExponentialBackoffTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   class TestAction < ::Actions::EntryAction
     include ::ForemanRhCloud::Async::ExponentialBackoff
@@ -19,29 +19,28 @@ class ExponentialBackoffTest < ActiveSupport::TestCase
   test 'executes an action once' do
     TestAction.any_instance.expects(:action_callback).returns(->(instance) { instance.done! })
 
-    action = create_and_plan_action(TestAction)
-    run_action(action)
+    ForemanTasks.sync_task(TestAction)
   end
 
   test 'fails after a single excution if done was called' do
     TestAction.any_instance.expects(:action_callback).returns(
       lambda do |instance|
         instance.done!
-        raise StandardError.new('Foo')
+        raise ::Foreman::Exception('Foo')
       end
     )
 
-    action = create_and_plan_action(TestAction)
-    run_action(action)
+    ForemanTasks.sync_task(TestAction)
   end
 
   test 'executes the task three times before failing it' do
     # speed up the execution
     TestAction.any_instance.stubs(:poll_intervals).returns([0, 0, 0])
 
-    TestAction.any_instance.expects(:action_callback).raises(StandardError.new('Foo')).at_least_once
+    TestAction.any_instance.expects(:action_callback).raises(::Foreman::Exception.new('Foo')).times(3)
 
-    action = create_and_plan_action(TestAction)
-    run_action(action)
+    ForemanTasks.sync_task(TestAction)
+  rescue ForemanTasks::TaskError => ex
+    assert ex.aggregated_message =~ /Foo/
   end
 end

data/test/jobs/insights_client_status_aging_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsClientStatusAgingTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -21,8 +21,7 @@ class InsightsClientStatusAgingTest < ActiveSupport::TestCase
     InsightsClientReportStatus.find_or_initialize_by(host_id: @host3.id).update(status: InsightsClientReportStatus::REPORTING, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
     InsightsClientReportStatus.find_or_initialize_by(host_id: @host4.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsClientStatusAging)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsClientStatusAging)
 
     @hosts.each(&:reload)
 

data/test/jobs/insights_full_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsFullSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
 
   setup do
@@ -72,8 +72,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_notifications)
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
 
     @host1.reload
     @host2.reload
@@ -90,8 +89,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
   end
 
   test 'Manifest is deleted do not run task steps' do
@@ -102,8 +100,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
   end
 
   test 'Hits counters are reset correctly' do
@@ -113,11 +110,9 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
 
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
     # Invoke again
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
 
     @host1.reload
     @host2.reload
@@ -151,8 +146,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(hits)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization, @host2.organization])
 
     @host1.reload
     @host2.reload

data/test/jobs/insights_resolutions_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsResolutionsSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
 
   setup do
@@ -76,8 +76,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsResolutionsSync)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
     @rule.reload
 
     assert_equal 5, InsightsResolution.all.count
@@ -89,8 +88,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsResolutionsSync)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
 
     assert_equal 0, InsightsResolution.all.count
   end
@@ -100,8 +98,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsResolutionsSync)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
 
     assert_equal 0, InsightsResolution.all.count
   end
@@ -111,8 +108,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
     InsightsRule.all.delete_all
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsResolutionsSync)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
 
     assert_equal 0, InsightsResolution.all.count
   end

data/test/jobs/insights_rules_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsRulesSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
     rules_json = <<-'RULES_JSON'
@@ -119,8 +119,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     # do not cleanup unused rules for tests
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:cleanup_rules)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsRulesSync, Organization.all)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsRulesSync, Organization.all)
     @hit.reload
 
     assert_equal 2, InsightsRule.all.count
@@ -202,8 +201,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     # do not cleanup unused rules for tests
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:cleanup_rules)
 
-    action = create_and_plan_action(InsightsCloud::Async::InsightsRulesSync, Organization.all)
-    run_action(action)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsRulesSync, Organization.all)
 
     assert_equal 3, InsightsRule.all.count
   end

data/test/jobs/inventory_full_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InventoryFullSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
   include KatelloCVEHelper
 
@@ -265,8 +265,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host2.organization)
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
 
     @host2.reload
 
@@ -281,8 +280,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     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)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
     @host2.reload
 
     assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
@@ -293,8 +291,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
 
-    action = create_and_plan_action(InventorySync::Async::InventoryFullSync, @host1.organization)
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
   end
 
   test 'Should skip hosts that are not returned in query' do
@@ -307,8 +304,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     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)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
     @host2.reload
 
     assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first