From 159c05b10b89e2ffec90e331753a4dc66585e553 Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Thu, 23 Jul 2020 12:52:45 +0800 Subject: [PATCH 1/3] Fix Python 3.8.3 --- src/azure_devtools/scenario_tests/base.py | 2 +- src/azure_devtools/scenario_tests/patches.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 6b4fd00..21f3b65 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -130,7 +130,7 @@ def setUp(self): # set up cassette cm = self.vcr.use_cassette(self.recording_file) self.cassette = cm.__enter__() - self.addCleanup(cm.__exit__) + self.addCleanup(cm.__exit__, None, None, None) # set up mock patches if self.in_recording: diff --git a/src/azure_devtools/scenario_tests/patches.py b/src/azure_devtools/scenario_tests/patches.py index 74c2792..ba3d95c 100644 --- a/src/azure_devtools/scenario_tests/patches.py +++ b/src/azure_devtools/scenario_tests/patches.py @@ -34,4 +34,4 @@ def mock_in_unit_test(unit_test, target, replacement): mp = mock.patch(target, replacement) mp.__enter__() - unit_test.addCleanup(mp.__exit__) + unit_test.addCleanup(mp.__exit__, None, None, None) From 98962bc5b90ab293c9c6d7aff6875cfaeb7a20e4 Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Thu, 23 Jul 2020 14:36:41 +0800 Subject: [PATCH 2/3] revert --- src/azure_devtools/scenario_tests/patches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/patches.py b/src/azure_devtools/scenario_tests/patches.py index ba3d95c..74c2792 100644 --- a/src/azure_devtools/scenario_tests/patches.py +++ b/src/azure_devtools/scenario_tests/patches.py @@ -34,4 +34,4 @@ def mock_in_unit_test(unit_test, target, replacement): mp = mock.patch(target, replacement) mp.__enter__() - unit_test.addCleanup(mp.__exit__, None, None, None) + unit_test.addCleanup(mp.__exit__) From f74227ab4fa140dd40a58f7fe25c08e78b3061fc Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Thu, 23 Jul 2020 14:39:23 +0800 Subject: [PATCH 3/3] revert --- src/azure_devtools/scenario_tests/base.py | 2 +- src/azure_devtools/scenario_tests/patches.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 21f3b65..6b4fd00 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -130,7 +130,7 @@ def setUp(self): # set up cassette cm = self.vcr.use_cassette(self.recording_file) self.cassette = cm.__enter__() - self.addCleanup(cm.__exit__, None, None, None) + self.addCleanup(cm.__exit__) # set up mock patches if self.in_recording: diff --git a/src/azure_devtools/scenario_tests/patches.py b/src/azure_devtools/scenario_tests/patches.py index 74c2792..ba3d95c 100644 --- a/src/azure_devtools/scenario_tests/patches.py +++ b/src/azure_devtools/scenario_tests/patches.py @@ -34,4 +34,4 @@ def mock_in_unit_test(unit_test, target, replacement): mp = mock.patch(target, replacement) mp.__enter__() - unit_test.addCleanup(mp.__exit__) + unit_test.addCleanup(mp.__exit__, None, None, None)