Skip to content

Commit dea4297

Browse files
committed
✅ Improve tests reduce runtime
- Improve tests reduce runtime Signed-off-by: Shan E Ahmed Raza <[email protected]>
1 parent d0d4ed6 commit dea4297

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

tests/conftest.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,25 @@ def sample_all_wsis2(sample_ndpi2, sample_svs, sample_jp2, tmpdir_factory):
144144
return dir_path
145145

146146

147+
@pytest.fixture(scope="session")
148+
def sample_svs_ndpi_wsis(sample_ndpi2, sample_svs, tmpdir_factory):
149+
"""Sample SVS and NDPI wsi(s).
150+
151+
Uses sample fluorescence ndpi image.
152+
153+
"""
154+
dir_path = pathlib.Path(tmpdir_factory.mktemp("data"))
155+
156+
try:
157+
dir_path.joinpath(sample_ndpi2.name).symlink_to(sample_ndpi2)
158+
dir_path.joinpath(sample_svs.name).symlink_to(sample_svs)
159+
except OSError:
160+
shutil.copy(sample_ndpi2, dir_path.joinpath(sample_ndpi2.name))
161+
shutil.copy(sample_svs, dir_path.joinpath(sample_svs.name))
162+
163+
return dir_path
164+
165+
147166
@pytest.fixture(scope="session")
148167
def source_image(remote_sample) -> pathlib.Path:
149168
"""Sample pytest fixture for source image.

tests/test_save_tiles.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
# -------------------------------------------------------------------------------------
1313

1414

15-
def test_command_line_save_tiles(sample_all_wsis2, tmp_path):
15+
def test_command_line_save_tiles(sample_svs_ndpi_wsis, tmp_path):
1616
"""Test for save_tiles CLI."""
1717
runner = CliRunner()
1818
save_tiles_result = runner.invoke(
1919
cli.main,
2020
[
2121
"save-tiles",
2222
"--img-input",
23-
str(pathlib.Path(sample_all_wsis2)),
23+
str(pathlib.Path(sample_svs_ndpi_wsis)),
2424
"--file-types",
25-
"*.ndpi, *.svs, *.jp2",
25+
"*.ndpi, *.svs",
2626
"--tile-objective-value",
2727
"5",
2828
"--output-path",
@@ -33,7 +33,7 @@ def test_command_line_save_tiles(sample_all_wsis2, tmp_path):
3333
tmp_path = pathlib.Path(tmp_path)
3434
cmu_small_region = tmp_path / "all_tiles" / "CMU-1-Small-Region.svs"
3535
bioformatspull2759 = tmp_path / "all_tiles" / "bioformatspull2759.ndpi"
36-
test1jp2 = tmp_path / "all_tiles" / "test1.jp2"
36+
3737
assert save_tiles_result.exit_code == 0
3838
assert (cmu_small_region / "Output.csv").exists()
3939
assert (cmu_small_region / "slide_thumbnail.jpg").exists()
@@ -42,9 +42,6 @@ def test_command_line_save_tiles(sample_all_wsis2, tmp_path):
4242
assert (bioformatspull2759 / "Output.csv").exists()
4343
assert (bioformatspull2759 / "slide_thumbnail.jpg").exists()
4444
assert (bioformatspull2759 / "Tile_5_0_0.jpg").exists()
45-
assert (test1jp2 / "Output.csv").exists()
46-
assert (test1jp2 / "slide_thumbnail.jpg").exists()
47-
assert (test1jp2 / "Tile_5_0_0.jpg").exists()
4845

4946

5047
def test_command_line_save_tiles_single_file(sample_svs, tmp_path):

0 commit comments

Comments
 (0)