# HG changeset patch # User Martin Bornhold # Date 2016-08-08 13:03:03 # Node ID 4f5ebd996824bf201cd2bc00548a50d699535fc9 # Parent 3bdca2728117ad8a49f8ccc9ed30b041f828b70e tests: Use settings dict from fixture instead of grabbing it from the WSGI app stack. diff --git a/rhodecode/tests/lib/middleware/test_simplevcs.py b/rhodecode/tests/lib/middleware/test_simplevcs.py --- a/rhodecode/tests/lib/middleware/test_simplevcs.py +++ b/rhodecode/tests/lib/middleware/test_simplevcs.py @@ -284,12 +284,11 @@ class TestInitializeGenerator: class TestPrepareHooksDaemon(object): - def test_calls_imported_prepare_callback_daemon(self, pylonsapp): - settings = pylonsapp.application.config + def test_calls_imported_prepare_callback_daemon(self, app_settings): expected_extras = {'extra1': 'value1'} daemon = DummyHooksCallbackDaemon() - controller = StubVCSController(None, settings, None) + controller = StubVCSController(None, app_settings, None) prepare_patcher = mock.patch.object( simplevcs, 'prepare_callback_daemon', return_value=(daemon, expected_extras)) @@ -298,8 +297,8 @@ class TestPrepareHooksDaemon(object): expected_extras.copy()) prepare_mock.assert_called_once_with( expected_extras, - protocol=settings['vcs.hooks.protocol'], - use_direct_calls=settings['vcs.hooks.direct_calls']) + protocol=app_settings['vcs.hooks.protocol'], + use_direct_calls=app_settings['vcs.hooks.direct_calls']) assert callback_daemon == daemon assert extras == extras