diff --git a/awx/main/tests/unit/utils/test_reload.py b/awx/main/tests/unit/utils/test_reload.py index d1f3291753..83466c9cc8 100644 --- a/awx/main/tests/unit/utils/test_reload.py +++ b/awx/main/tests/unit/utils/test_reload.py @@ -4,7 +4,7 @@ from awx.main.utils import reload def test_produce_supervisor_command(mocker): with mocker.patch.object(reload.subprocess, 'Popen'): - reload._supervisor_service_restart(['beat', 'callback', 'fact']) + reload._supervisor_service_command(['beat', 'callback', 'fact'], "restart") reload.subprocess.Popen.assert_called_once_with( ['supervisorctl', 'restart', 'tower-processes:receiver', 'tower-processes:factcacher']) @@ -14,13 +14,13 @@ def test_routing_of_service_restarts_works(mocker): This tests that the parent restart method will call the appropriate service restart methods, depending on which services are given in args ''' - with mocker.patch.object(reload, '_uwsgi_reload'),\ + with mocker.patch.object(reload, '_uwsgi_fifo_command'),\ mocker.patch.object(reload, '_reset_celery_thread_pool'),\ - mocker.patch.object(reload, '_supervisor_service_restart'): + mocker.patch.object(reload, '_supervisor_service_command'): reload.restart_local_services(['uwsgi', 'celery', 'flower', 'daphne']) - reload._uwsgi_reload.assert_called_once_with() + reload._uwsgi_fifo_command.assert_called_once_with(uwsgi_command="c") reload._reset_celery_thread_pool.assert_called_once_with() - reload._supervisor_service_restart.assert_called_once_with(['flower', 'daphne']) + reload._supervisor_service_command.assert_called_once_with(['flower', 'daphne'], command="restart") @@ -28,11 +28,11 @@ def test_routing_of_service_restarts_diables(mocker): ''' Test that methods are not called if not in the args ''' - with mocker.patch.object(reload, '_uwsgi_reload'),\ + with mocker.patch.object(reload, '_uwsgi_fifo_command'),\ mocker.patch.object(reload, '_reset_celery_thread_pool'),\ - mocker.patch.object(reload, '_supervisor_service_restart'): + mocker.patch.object(reload, '_supervisor_service_command'): reload.restart_local_services(['flower']) - reload._uwsgi_reload.assert_not_called() + reload._uwsgi_fifo_command.assert_not_called() reload._reset_celery_thread_pool.assert_not_called() - reload._supervisor_service_restart.assert_called_once_with(['flower']) + reload._supervisor_service_command.assert_called_once_with(['flower'], command="restart")