fix callback test branding

RedHatSatellite · Nov 12, 2021 · c217f37 · c217f37
1 parent ce0ff26
commit c217f37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -126,7 +126,7 @@ vendor:
 	python vendor.py build/apypie-git/apypie/*.py > plugins/module_utils/_apypie.py
 
 branding:
-	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md tests/test_playbooks/fixtures/*.yml
+	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_callback.py tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md tests/test_playbooks/fixtures/*.yml
 	sed -i 's/foreman.example.com/satellite.example.com/g' plugins/*/*.py docs/cvmanager.md roles/*/README.md roles/*/*/*.yml
 	sed -i 's#theforeman/foreman-ansible-modules#RedHatSatellite/satellite-ansible-collection#g' .github/workflows/*.yml
 	sed -i 's/theforeman-foreman/redhat-satellite/g' .github/workflows/*.yml

diff --git a/tests/test_callback.py b/tests/test_callback.py
@@ -14,11 +14,11 @@ def run_playbook_callback(tmpdir, report_type):
     if ansible_version is None:
         pytest.skip("Couldn't figure out Ansible version?!")
     if distutils.version.LooseVersion(ansible_version) < distutils.version.LooseVersion('2.11'):
-        extra_env['ANSIBLE_CALLBACK_WHITELIST'] = "theforeman.foreman.foreman"
+        extra_env['ANSIBLE_CALLBACK_WHITELIST'] = "redhat.satellite.foreman"
         extra_env['ANSIBLE_COMMAND_WARNINGS'] = "0"
     else:
-        extra_env['ANSIBLE_CALLBACKS_ENABLED'] = "theforeman.foreman.foreman"
-    extra_env['ANSIBLE_STDOUT_CALLBACK'] = "theforeman.foreman.foreman"
+        extra_env['ANSIBLE_CALLBACKS_ENABLED'] = "redhat.satellite.foreman"
+    extra_env['ANSIBLE_STDOUT_CALLBACK'] = "redhat.satellite.foreman"
     extra_env['ANSIBLE_LOAD_CALLBACK_PLUGINS'] = "1"
     # No connection is actually performed during the test
     extra_env['FOREMAN_REPORT_TYPE'] = report_type