Fixes for PEP451 import loaders and pytest 5.x

- pytest 5.x drops python2 compatibility and therefore only implements PEP 451
- pytest 5.x made the repr of `ExcInfo` less confusing (fixed tests depending
  on the old format)
This commit is contained in:
Anthony Sottile 2019-07-01 07:23:03 -07:00 committed by David Lord
parent b9c2267272
commit a5ecdfa7a5
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
6 changed files with 57 additions and 25 deletions

View file

@ -1219,17 +1219,17 @@ def test_response_type_errors():
with pytest.raises(TypeError) as e:
c.get('/none')
assert 'returned None' in str(e)
assert 'returned None' in str(e.value)
with pytest.raises(TypeError) as e:
c.get('/small_tuple')
assert 'tuple must have the form' in str(e)
assert 'tuple must have the form' in str(e.value)
pytest.raises(TypeError, c.get, '/large_tuple')
with pytest.raises(TypeError) as e:
c.get('/bad_type')
assert 'it was a bool' in str(e)
assert 'it was a bool' in str(e.value)
pytest.raises(TypeError, c.get, '/bad_wsgi')
@ -1622,7 +1622,7 @@ def test_debug_mode_complains_after_first_request(app, client):
@app.route('/foo')
def broken():
return 'Meh'
assert 'A setup function was called' in str(e)
assert 'A setup function was called' in str(e.value)
app.debug = False
@ -1677,9 +1677,9 @@ def test_routing_redirect_debugging(app, client):
with client:
with pytest.raises(AssertionError) as e:
client.post('/foo', data={})
assert 'http://localhost/foo/' in str(e)
assert 'http://localhost/foo/' in str(e.value)
assert ('Make sure to directly send '
'your POST-request to this URL') in str(e)
'your POST-request to this URL') in str(e.value)
rv = client.get('/foo', data={}, follow_redirects=True)
assert rv.data == b'success'