Skip to content

Fix 462 #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gusmith merged 17 commits into from
Nov 12, 2019
Merged

Fix 462 #463

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
13bdbc0
Single method to get and set the upload status in db.
gusmith Nov 11, 2019
bbadadd
4 states for uploaded in the dataprovider table.
gusmith Nov 11, 2019
784ef41
Use the state `done` instead of the boolean TRUE.
gusmith Nov 11, 2019
3d8890b
Two new tests related to this new feature.
gusmith Nov 11, 2019
56b5fc1
The main change when posting clks to a project, check that we can pos…
gusmith Nov 11, 2019
104f49e
Tiny cleanup of a variable.
gusmith Nov 11, 2019
08fc85b
Some comments in the tests.
gusmith Nov 11, 2019
db74fc0
Update changelo
gusmith Nov 11, 2019
0680f36
Typo in changelog
gusmith Nov 11, 2019
83263ba
Clean test and modifying variable name.
gusmith Nov 11, 2019
5474008
Rename method to update upload state and add nicer documentation.
gusmith Nov 12, 2019
ce02a82
Change dur to remanimg
gusmith Nov 12, 2019
13e65da
Rename the test methods to be more explicit.
gusmith Nov 12, 2019
e5a7b7b
Rename an enum and add documentation about them.
gusmith Nov 12, 2019
3a30ad2
Typos.
gusmith Nov 12, 2019
7216f31
Rename again a test method.
gusmith Nov 12, 2019
6a68f18
Documentation correction from PR review.
gusmith Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename the test methods to be more explicit.
  • Loading branch information
@gusmith
gusmith committed Nov 12, 2019
commit 13e65da542fac3f6d974a55376c38078e08efed8
4 changes: 2 additions & 2 deletions backend/entityservice/tests/test_project_uploads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def test_project_single_party_empty_data_upload(
assert r.status_code == 400


def test_project_upload_wrong_authentication(requests, valid_project_params):
def test_project_upload_re_used_authentication(requests, valid_project_params):
"""
Test that a token cannot be re-used to upload clks.
So first, create a project, upload clks with a token (which should work), and then re-upload clks using the same
Expand Down Expand Up @@ -267,7 +267,7 @@ def test_project_upload_wrong_authentication(requests, valid_project_params):
small_file_path, new_project_data['project_id'], token_to_reuse, 1000, expected_status_code=403)


def test_project_upload_fail_then_works(requests, valid_project_params):
def test_project_upload_invalid_clks_then_valid_clks_same_authentication(requests, valid_project_params):
"""
Test that a token can be re-used to upload clks after the upload failed.
So first, create a project, upload clks with a token (which should NOT work with a 400 error),
Expand Down