From c09957df7f75f0793bec7cf1b75ef61b750fac09 Mon Sep 17 00:00:00 2001 From: Vladislav Date: Thu, 30 Nov 2023 16:01:34 +0500 Subject: [PATCH] Rename is_invalid_file var --- tests/conftest.py | 4 ++-- tests/fake_app/factories.py | 4 ++-- .../test_models/test_import/test_import_data.py | 16 ++++++++-------- tests/test_models/test_import/test_parse_data.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 60f4906..9d5c04b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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, ) @@ -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", diff --git a/tests/fake_app/factories.py b/tests/fake_app/factories.py index d0e8d2f..79317bf 100644 --- a/tests/fake_app/factories.py +++ b/tests/fake_app/factories.py @@ -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( diff --git a/tests/test_models/test_import/test_import_data.py b/tests/test_models/test_import/test_import_data.py index 07f5a77..314a3f6 100644 --- a/tests/test_models/test_import/test_import_data.py +++ b/tests/test_models/test_import/test_import_data.py @@ -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, ): @@ -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() @@ -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() diff --git a/tests/test_models/test_import/test_parse_data.py b/tests/test_models/test_import/test_parse_data.py index 7842c3a..e61dbbd 100644 --- a/tests/test_models/test_import/test_parse_data.py +++ b/tests/test_models/test_import/test_parse_data.py @@ -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()