Skip to content

Commit

Permalink
remove pytest-warnings from test dependencies (#548)
Browse files Browse the repository at this point in the history
* remove pytest-warnings from test dependencies (already shipped with modern pytest versions)

* add pep8 marker in order to fix tests (or remove strict option)

* unicode warning
  • Loading branch information
davidemoro authored and disko committed Jan 5, 2018
1 parent 3da0253 commit 462d847
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Change History

- Feature: add Czech translation.

- remove pytest-warnings from test dependencies (already integrated in
modern pytest versions)

1.3.0 - 2016-10-10
------------------

Expand Down
6 changes: 3 additions & 3 deletions kotti/tests/test_filedepot.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):

# the attachments (created by the filters) are served by the
# FiledepotServeApp
resp = webtest.app.get(img.data['thumb_128x128_url'])
resp = webtest.app.get(img.data[u'thumb_128x128_url'])

assert resp.etag is not None
assert resp.cache_control.max_age == 604800
assert resp.body.startswith('\x89PNG')

resp = webtest.app.get(img.data['thumb_256x256_url'])
resp = webtest.app.get(img.data[u'thumb_256x256_url'])
assert resp.etag is not None
assert resp.cache_control.max_age == 604800
assert resp.body.startswith('\x89PNG')
Expand All @@ -294,6 +294,6 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):
resp = webtest.app.get('/depot/non_existing/fileid', status=404)
assert resp.status_code == 404

resp = webtest.app.get(img.data['thumb_256x256_url'] + 'not',
resp = webtest.app.get(img.data[u'thumb_256x256_url'] + 'not',
status=404)
assert resp.status_code == 404
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
markers =
user: mark test to be run as the given user
slow: mark test to be run only with --runslow option
pep8: pep8 marker
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
'pytest-pep8!=1.0.3',
'pytest-travis-fold',
'pytest-virtualenv',
'pytest-warnings',
'pytest-xdist',
'tox',
'virtualenv', # needed for scaffolding tests
Expand Down

0 comments on commit 462d847

Please sign in to comment.