From 9ea970e932e6c5baf18ff6a892a18f787df219e2 Mon Sep 17 00:00:00 2001 From: Sebastian Diaz Date: Thu, 11 Jan 2024 09:44:41 +0100 Subject: [PATCH] Moved constant for Correct sample sheet to tests --- cg/constants/demultiplexing.py | 1 - .../demultiplex_fixtures/path_fixtures.py | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cg/constants/demultiplexing.py b/cg/constants/demultiplexing.py index 2ff9ff2820..10cfe8d36e 100644 --- a/cg/constants/demultiplexing.py +++ b/cg/constants/demultiplexing.py @@ -29,7 +29,6 @@ class DemultiplexingDirsAndFiles(StrEnum): RUN_PARAMETERS_PASCAL_CASE: str = "RunParameters.xml" RUN_PARAMETERS_CAMEL_CASE: str = "runParameters.xml" SAMPLE_SHEET_FILE_NAME: str = "SampleSheet.csv" - CORRECT_SAMPLE_SHEET: str = "CorrectSampleSheet.csv" UNALIGNED_DIR_NAME: str = "Unaligned" BCL2FASTQ_TILE_DIR_PATTERN: str = r"l\dt\d{2}" QUEUED_FOR_POST_PROCESSING: str = "post_processing_queued.txt" diff --git a/tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py b/tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py index e6e3b8750f..807c34ee41 100644 --- a/tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py +++ b/tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py @@ -8,6 +8,8 @@ from cg.constants.nanopore_files import NanoporeDirsAndFiles from cg.models.flow_cell.flow_cell import FlowCellDirectoryData +CORRECT_SAMPLE_SHEET: str = "CorrectSampleSheet.csv" + @pytest.fixture(name="tmp_flow_cells_directory") def tmp_flow_cells_directory(tmp_path: Path, flow_cells_dir: Path) -> Path: @@ -208,9 +210,7 @@ def novaseq_6000_post_1_5_kits_flow_cell(tmp_flow_cells_directory: Path) -> Path def novaseq_6000_post_1_5_kits_correct_sample_sheet( novaseq_6000_post_1_5_kits_flow_cell: Path, ) -> Path: - return Path( - novaseq_6000_post_1_5_kits_flow_cell, DemultiplexingDirsAndFiles.CORRECT_SAMPLE_SHEET - ) + return Path(novaseq_6000_post_1_5_kits_flow_cell, CORRECT_SAMPLE_SHEET) @pytest.fixture @@ -229,9 +229,7 @@ def novaseq_6000_pre_1_5_kits_flow_cell(tmp_flow_cells_directory: Path) -> Path: def novaseq_6000_pre_1_5_kits_correct_sample_sheet( novaseq_6000_pre_1_5_kits_flow_cell: Path, ) -> Path: - return Path( - novaseq_6000_pre_1_5_kits_flow_cell, DemultiplexingDirsAndFiles.CORRECT_SAMPLE_SHEET - ) + return Path(novaseq_6000_pre_1_5_kits_flow_cell, CORRECT_SAMPLE_SHEET) @pytest.fixture @@ -246,7 +244,7 @@ def novaseq_x_flow_cell_directory(tmp_flow_cells_directory: Path) -> Path: @pytest.fixture def novaseq_x_correct_sample_sheet(novaseq_x_flow_cell_directory: Path) -> Path: - return Path(novaseq_x_flow_cell_directory, DemultiplexingDirsAndFiles.CORRECT_SAMPLE_SHEET) + return Path(novaseq_x_flow_cell_directory, CORRECT_SAMPLE_SHEET) @pytest.fixture