From c9cc1decb8c157e6ab7cc25dc563c2e6eef8d8c6 Mon Sep 17 00:00:00 2001 From: Paul McCarthy <pauldmccarthy@gmail.com> Date: Tue, 27 Feb 2018 15:06:58 +0000 Subject: [PATCH] mark more longtests, and another wxtest --- tests/test_atlases_query.py | 2 ++ tests/test_atlasq_ohi.py | 2 ++ tests/test_atlasq_query.py | 2 ++ tests/test_platform.py | 1 + 4 files changed, 7 insertions(+) diff --git a/tests/test_atlases_query.py b/tests/test_atlases_query.py index cda1f6aac..ea72f6686 100644 --- a/tests/test_atlases_query.py +++ b/tests/test_atlases_query.py @@ -96,9 +96,11 @@ def _get_zero_mask(aimg): def test_label_coord_query( seed): _test_query('coord', 'label') def test_label_voxel_query( seed): _test_query('voxel', 'label') +@pytest.mark.longtest def test_label_mask_query( seed): _test_query('mask', 'label') def test_summary_coord_query(seed): _test_query('coord', 'prob', summary=True) def test_summary_voxel_query(seed): _test_query('voxel', 'prob', summary=True) +@pytest.mark.longtest def test_summary_mask_query( seed): _test_query('mask', 'prob', summary=True) def test_prob_coord_query( seed): _test_query('coord', 'prob') def test_prob_voxel_query( seed): _test_query('voxel', 'prob') diff --git a/tests/test_atlasq_ohi.py b/tests/test_atlasq_ohi.py index 0f36eb20c..96c61572f 100644 --- a/tests/test_atlasq_ohi.py +++ b/tests/test_atlasq_ohi.py @@ -46,6 +46,7 @@ def test_dumpatlases(): assert capture.stdout.strip() == '\n'.join(atlases) +@pytest.mark.longtest def test_coords(seed): """Test the ohi -a "atlas" -c "coords" mode. """ @@ -142,6 +143,7 @@ def test_bad_atlas(): assert capture.stdout.strip() == expected +@pytest.mark.longtest def test_mask(seed): """Test the ohi -a "atlas" -m "mask" mode, with label and probabilistic atlases. diff --git a/tests/test_atlasq_query.py b/tests/test_atlasq_query.py index 427815405..5ba48f919 100644 --- a/tests/test_atlasq_query.py +++ b/tests/test_atlasq_query.py @@ -70,6 +70,8 @@ def test_query_voxel(seed): _test_query([t for t in tests if t[2] == 'voxel']) def test_query_coord(seed): _test_query([t for t in tests if t[2] == 'coordinate']) + +@pytest.mark.longtest def test_query_mask(seed): _test_query([t for t in tests if t[2].startswith('mask')]) diff --git a/tests/test_platform.py b/tests/test_platform.py index 6088009ef..4531f7534 100644 --- a/tests/test_platform.py +++ b/tests/test_platform.py @@ -63,6 +63,7 @@ def test_haveGui(): assert passed[0] +@pytest.mark.wxtest def test_wxatts(): with mock.patch.dict('sys.modules', wx=None): -- GitLab