From 23267d8a4bb257d7ea50c52c2111f67390f36775 Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Fri, 15 Jul 2016 22:42:19 -0700 Subject: [PATCH] Fix for python 2. --- tests/conftest.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 8843d4c..32b22c5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -125,17 +125,18 @@ def refresh_token(request): @pytest.yield_fixture() def config(): - with patch('rtv.config.Config.save_history'), \ - patch('rtv.config.Config.delete_history'), \ - patch('rtv.config.Config.save_refresh_token'), \ - patch('rtv.config.Config.delete_refresh_token'): - - def delete_refresh_token(self): + conf = Config() + with mock.patch.object(conf, 'save_history'), \ + mock.patch.object(conf, 'delete_history'), \ + mock.patch.object(conf, 'save_refresh_token'), \ + mock.patch.object(conf, 'delete_refresh_token'): + + def delete_refresh_token(): # Skip the os.remove - self.refresh_token = None - Config.delete_refresh_token.side_effect = delete_refresh_token + conf.refresh_token = None + conf.delete_refresh_token.side_effect = delete_refresh_token - yield Config() + yield conf @pytest.yield_fixture()