mirror of
https://github.com/ansible/awx.git
synced 2026-03-02 09:18:48 -03:30
Merge branch 'purge_ansible_name' into release_3.2.0
* purge_ansible_name: Remove ansible reference from dev PKG-INFO Add back in PRIVILEGE_ESCALATION_METHODS inadvertantly removed Add awx_ and AWX_ environment vars and extra_vars alongside Tower Refactor some tower periodic tasks to label as awx Refactor Notification backend for tower -> awx Refactor fact cache plugin from tower -> awx Rename tower display plugins to awx display Mass rename from ansible_(awx|tower) -> (awx|tower)
This commit is contained in:
@@ -6,7 +6,7 @@ from django.utils.timezone import now, timedelta
|
||||
|
||||
from awx.main.tasks import (
|
||||
RunProjectUpdate, RunInventoryUpdate,
|
||||
tower_isolated_heartbeat,
|
||||
awx_isolated_heartbeat,
|
||||
isolated_manager
|
||||
)
|
||||
from awx.main.models import (
|
||||
@@ -121,7 +121,7 @@ class TestIsolatedManagementTask:
|
||||
original_isolated_instance = needs_updating.instances.all().first()
|
||||
with mock.patch('awx.main.tasks.settings', MockSettings()):
|
||||
with mock.patch.object(isolated_manager.IsolatedManager, 'health_check') as check_mock:
|
||||
tower_isolated_heartbeat()
|
||||
awx_isolated_heartbeat()
|
||||
iso_instance = Instance.objects.get(hostname='isolated')
|
||||
call_args, _ = check_mock.call_args
|
||||
assert call_args[0][0] == iso_instance
|
||||
@@ -131,7 +131,7 @@ class TestIsolatedManagementTask:
|
||||
def test_does_not_take_action(self, control_instance, just_updated):
|
||||
with mock.patch('awx.main.tasks.settings', MockSettings()):
|
||||
with mock.patch.object(isolated_manager.IsolatedManager, 'health_check') as check_mock:
|
||||
tower_isolated_heartbeat()
|
||||
awx_isolated_heartbeat()
|
||||
iso_instance = Instance.objects.get(hostname='isolated')
|
||||
check_mock.assert_not_called()
|
||||
assert iso_instance.capacity == 103
|
||||
|
||||
Reference in New Issue
Block a user