From ea891a145832f53c7581357999a5c243204b9842 Mon Sep 17 00:00:00 2001 From: Cameron Yick Date: Sat, 12 Dec 2020 20:10:24 -0500 Subject: [PATCH] Update test to support both python 2 and python 3 --- tests/test_restclient.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/test_restclient.py b/tests/test_restclient.py index 001f9a3..bb9fd54 100644 --- a/tests/test_restclient.py +++ b/tests/test_restclient.py @@ -34,7 +34,14 @@ class TestRestClient(TestCase): # Test 404 error def test_invalid_url(self): - with self.assertRaisesRegex(RestClientError, "404"),\ + + # Suppress deprecation warning in python 3 + if hasattr(self, 'assertRaisesRegex'): + assertFunc = self.assertRaisesRegex + else: + assertFunc = self.assertRaisesRegexp + + with assertFunc(RestClientError, "404"),\ vcr.use_cassette('tests/fixtures/invalid_url.yaml'): # Should return 404 error self._client._request('GET', "bing_is_great") @@ -66,7 +73,14 @@ class TestRestClientWithSession(TestCase): # Test 404 error def test_invalid_url(self): - with self.assertRaisesRegex(RestClientError, "404"),\ + + # Suppress deprecation warning in python 3 + if hasattr(self, 'assertRaisesRegex'): + assertFunc = self.assertRaisesRegex + else: + assertFunc = self.assertRaisesRegexp + + with assertFunc(RestClientError, "404"),\ vcr.use_cassette('tests/fixtures/invalid_url.yaml'): # Should return 404 error self._client._request('GET', "bing_is_great")