From 76af20c99e485858a654bb1e6c5bd9e04621ae54 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 15 May 2019 18:19:14 +0200 Subject: [PATCH] tests: fix PEP8ness --- tests/settings.py | 2 +- tests/test_api.py | 10 +++++----- tests/test_oauth2.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/settings.py b/tests/settings.py index 89a2b1d..b40c406 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,4 +1,5 @@ import os +import tempfile DEBUG = False @@ -15,5 +16,4 @@ DATABASES = { } } -import tempfile MEDIA_ROOT = tempfile.mkdtemp('fargo-test') diff --git a/tests/test_api.py b/tests/test_api.py index 4160215..2c45a35 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -74,7 +74,7 @@ def test_push_document(app, admin_user, john_doe): assert models.Origin.objects.get().slug == 'wcs' assert models.UserDocument.objects.count() == 1 assert models.UserDocument.objects.get().user == john_doe - assert models.UserDocument.objects.get().deletable_by_user == True + assert models.UserDocument.objects.get().deletable_by_user is True assert models.Document.objects.count() == 1 assert models.Document.objects.get().content.read() == b'coin' assert (models.UserDocument.objects.get().document @@ -86,15 +86,15 @@ def test_push_document(app, admin_user, john_doe): data['deletable_by_user'] = False response = app.post_json(url, params=data, status=200) assert response.json['result'] == 1 - assert models.Origin.objects.count() == 1 # same origin - assert models.UserDocument.objects.count() == 2 # new document + assert models.Origin.objects.count() == 1 # same origin + assert models.UserDocument.objects.count() == 2 # new document assert models.UserDocument.objects.filter(deletable_by_user=False).count() == 1 data['file_b64_content'] = base64.b64encode(b'coin3').decode() data['deletable_by_user'] = True response = app.post_json(url, params=data, status=200) assert response.json['result'] == 1 - assert models.UserDocument.objects.count() == 3 # new document + assert models.UserDocument.objects.count() == 3 # new document assert models.UserDocument.objects.filter(deletable_by_user=True).count() == 2 # same document @@ -103,7 +103,7 @@ def test_push_document(app, admin_user, john_doe): response = app.post_json(url, params=data, status=400) assert response.json['result'] == 0 assert response.json['errors'][0]['code'] == 'document-exists' - assert models.UserDocument.objects.count() == 3 # no new document + assert models.UserDocument.objects.count() == 3 # no new document def test_push_document_max_document_size(app, private_settings, admin_user, john_doe): diff --git a/tests/test_oauth2.py b/tests/test_oauth2.py index 3b17505..b7f0b6e 100644 --- a/tests/test_oauth2.py +++ b/tests/test_oauth2.py @@ -238,9 +238,9 @@ def test_command_create_client(db): def test_command_put_document(db, capsys, app, john_doe): call_command('oauth2-create-client', 'test', 'https://example.com/') client = OAuth2Client.objects.get() - path = os.path.join(os.path.dirname(__file__), 'pdf-sample.pdf') + path = os.path.join(os.path.dirname(__file__), 'pdf-sample.pdf') redirect_uri = 'https://example.com/' - r = call_command('oauth2-put-document', '--client-id=%s' % client.pk, redirect_uri, path) + call_command('oauth2-put-document', '--client-id=%s' % client.pk, redirect_uri, path) out, err = capsys.readouterr() assert err == '' url = out.strip()