Skip to content

Commit

Permalink
Moved constant for Correct sample sheet to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
diitaz93 committed Jan 11, 2024
1 parent a03e46d commit 9ea970e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
1 change: 0 additions & 1 deletion cg/constants/demultiplexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 5 additions & 7 deletions tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 9ea970e

Please sign in to comment.