Skip to content

Commit

Permalink
Rename is_invalid_file var
Browse files Browse the repository at this point in the history
  • Loading branch information
yalef committed Nov 30, 2023
1 parent 28c530a commit c09957d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def force_import_artist_job(new_artist: Artist) -> Artist:
"""Return `ImportJob` with `force_import=True` and file with invalid row."""
return ArtistImportJobFactory(
artists=[new_artist],
is_invalid_file=True,
is_valid_file=False,
force_import=True,
)

Expand All @@ -90,7 +90,7 @@ def invalid_uploaded_file(new_artist: Artist) -> SimpleUploadedFile:
import_job = ArtistImportJobFactory.build(
artists=[new_artist],
force_import=True,
is_invalid_file=True,
is_valid_file=False,
)
return SimpleUploadedFile(
"test_file.csv",
Expand Down
4 changes: 2 additions & 2 deletions tests/fake_app/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ class Meta:

class Params:
artists: list[models.Artist] = []
is_invalid_file: bool = False
is_valid_file: bool = True

@factory.lazy_attribute
def data_file(self):
"""Generate `data_file` based on passed `artists`."""
resource = SimpleArtistResource()

if self.is_invalid_file:
if not self.is_valid_file:
# Append not existing artist with a non-existent instrument
# to violate the not-null constraint
self.artists.append(
Expand Down
16 changes: 8 additions & 8 deletions tests/test_models/test_import/test_import_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,22 @@ def test_import_data_wrong_status(artist_import_job: ImportJob):
@pytest.mark.parametrize(
[
"skip_parse_step",
"is_invalid_file",
"is_valid_file",
"expected_status",
"is_instance_created",
],
[
[False, False, ImportJob.ImportStatus.PARSED, False],
[False, True, ImportJob.ImportStatus.INPUT_ERROR, False],
[True, False, ImportJob.ImportStatus.IMPORTED, True],
[True, True, ImportJob.ImportStatus.IMPORT_ERROR, False],
[False, True, ImportJob.ImportStatus.PARSED, False],
[False, False, ImportJob.ImportStatus.INPUT_ERROR, False],
[True, True, ImportJob.ImportStatus.IMPORTED, True],
[True, False, ImportJob.ImportStatus.IMPORT_ERROR, False],
],
)
@pytest.mark.django_db(transaction=True)
def test_import_data_skip_parse_step(
new_artist: Artist,
skip_parse_step: bool,
is_invalid_file: bool,
is_valid_file: bool,
expected_status: ImportJob.ImportStatus,
is_instance_created: bool,
):
Expand All @@ -117,7 +117,7 @@ def test_import_data_skip_parse_step(
artists=[new_artist],
force_import=False,
skip_parse_step=skip_parse_step,
is_invalid_file=is_invalid_file,
is_valid_file=is_valid_file,
)
import_job.save()
import_job.refresh_from_db()
Expand All @@ -135,7 +135,7 @@ def test_force_import_create_correct_rows(
artists=[new_artist],
force_import=True,
skip_parse_step=True,
is_invalid_file=True,
is_valid_file=False,
)
import_job.import_data()
import_job.refresh_from_db()
Expand Down
2 changes: 1 addition & 1 deletion tests/test_models/test_import/test_parse_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def test_parse_data_invalid_row_file(
import_job: ImportJob = ArtistImportJobFactory(
artists=[new_artist],
force_import=force_import,
is_invalid_file=True,
is_valid_file=False,
)
import_job.parse_data()
import_job.refresh_from_db()
Expand Down

0 comments on commit c09957d

Please sign in to comment.