From 3023b4dfaa6289265c5e3f04c08a47540071ab2b Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 15 Feb 2017 14:53:01 -0500 Subject: [PATCH] switch to new nested with pattern from PR review --- awx/main/tests/unit/utils/test_reload.py | 29 ++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/awx/main/tests/unit/utils/test_reload.py b/awx/main/tests/unit/utils/test_reload.py index 3b8d66b56d..d1f3291753 100644 --- a/awx/main/tests/unit/utils/test_reload.py +++ b/awx/main/tests/unit/utils/test_reload.py @@ -14,24 +14,25 @@ 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, '_reset_celery_thread_pool'): - with mocker.patch.object(reload, '_supervisor_service_restart'): - reload.restart_local_services(['uwsgi', 'celery', 'flower', 'daphne']) - reload._uwsgi_reload.assert_called_once_with() - reload._reset_celery_thread_pool.assert_called_once_with() - reload._supervisor_service_restart.assert_called_once_with(['flower', 'daphne']) + with mocker.patch.object(reload, '_uwsgi_reload'),\ + mocker.patch.object(reload, '_reset_celery_thread_pool'),\ + mocker.patch.object(reload, '_supervisor_service_restart'): + reload.restart_local_services(['uwsgi', 'celery', 'flower', 'daphne']) + reload._uwsgi_reload.assert_called_once_with() + reload._reset_celery_thread_pool.assert_called_once_with() + reload._supervisor_service_restart.assert_called_once_with(['flower', 'daphne']) + 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, '_reset_celery_thread_pool'): - with mocker.patch.object(reload, '_supervisor_service_restart'): - reload.restart_local_services(['flower']) - reload._uwsgi_reload.assert_not_called() - reload._reset_celery_thread_pool.assert_not_called() - reload._supervisor_service_restart.assert_called_once_with(['flower']) + with mocker.patch.object(reload, '_uwsgi_reload'),\ + mocker.patch.object(reload, '_reset_celery_thread_pool'),\ + mocker.patch.object(reload, '_supervisor_service_restart'): + reload.restart_local_services(['flower']) + reload._uwsgi_reload.assert_not_called() + reload._reset_celery_thread_pool.assert_not_called() + reload._supervisor_service_restart.assert_called_once_with(['flower'])