diff options
| author | John Carter <john@therefromhere.org> | 2019-01-19 13:28:51 +1300 |
|---|---|---|
| committer | John Carter <john@therefromhere.org> | 2019-01-19 13:28:51 +1300 |
| commit | 9f3193da7408cec9ac9c612e047d1c48ba9e542c (patch) | |
| tree | 146f66241fdb76772ccdaa029b308947223ff077 | |
| parent | fb534f103f20d6de614189c4baa960de004a6ad7 (diff) | |
| download | webtest-9f3193da7408cec9ac9c612e047d1c48ba9e542c.tar.gz | |
Explicitly raise AssertionError in response checks
so they still check with PYTHONOPTIMIZE>=1
| -rw-r--r-- | tests/test_response.py | 6 | ||||
| -rw-r--r-- | webtest/response.py | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/test_response.py b/tests/test_response.py index 3885818..f3dad7f 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -448,9 +448,8 @@ class TestFollow(unittest.TestCase): resp = resp.follow() self.assertEqual(resp.body, b'done') - if sys.flags.optimize == 0: - # can't follow non-redirect - self.assertRaises(AssertionError, resp.follow) + # can't follow non-redirect + self.assertRaises(AssertionError, resp.follow) def test_follow_relative(self): app = self.get_redirects_app(2, ['hello/foo/', 'bar']) @@ -484,7 +483,6 @@ class TestFollow(unittest.TestCase): resp = app.get('/').maybe_follow() self.assertEqual(resp.body, b'done') - @unittest.skipIf(sys.flags.optimize > 0, "skip assert tests if optimize is enabled") def test_maybe_follow_infinite(self): app = self.get_redirects_app(100000) self.assertRaises(AssertionError, app.get('/').maybe_follow) diff --git a/webtest/response.py b/webtest/response.py index 4087c19..1976a5b 100644 --- a/webtest/response.py +++ b/webtest/response.py @@ -96,9 +96,10 @@ class TestResponse(webob.Response): arguments are passed to :class:`webtest.app.TestApp.get`. Returns another :class:`TestResponse` object. """ - assert 300 <= self.status_int < 400, ( - "You can only follow redirect responses (not %s)" - % self.status) + if not (300 <= self.status_int < 400): + raise AssertionError( + "You can only follow redirect responses (not %s)" % self.status + ) return self._follow(**kw) def maybe_follow(self, **kw): @@ -114,7 +115,9 @@ class TestResponse(webob.Response): response = response._follow(**kw) remaining_redirects -= 1 - assert remaining_redirects > 0, "redirects chain looks infinite" + if remaining_redirects <= 0: + raise AssertionError("redirects chain looks infinite") + return response def click(self, description=None, linkid=None, href=None, |