Skip to content

Commit 3a04584

Browse files
authored
replace empty returns in tests with annotated pytest.skip() calls. closes #1076 (#1356)
1 parent 8ad838d commit 3a04584

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

tests/smoke_tests/box/berry_1967/test_coalescence.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
@pytest.mark.parametrize("adaptive", (True, False))
2323
@pytest.mark.parametrize("kernel", (Geometric(), Electric(), Hydrodynamic()))
2424
def test_coalescence(backend_class, kernel, croupier, adaptive):
25-
if backend_class == ThrustRTC and croupier == "local": # TODO #358
26-
return
27-
if backend_class == ThrustRTC and adaptive and croupier == "global": # TODO #329
28-
return
25+
if backend_class == ThrustRTC and croupier == "local":
26+
pytest.skip("TODO #358")
27+
if backend_class == ThrustRTC and adaptive and croupier == "global":
28+
pytest.skip("TODO #329")
2929
# Arrange
3030
s = Settings()
3131
s.formulae.seed = 0

tests/unit_tests/dynamics/collisions/test_croupiers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@pytest.mark.parametrize("croupier", ["local", "global"])
1313
def test_final_state(croupier, backend_class):
1414
if backend_class is ThrustRTC:
15-
return # TODO #330
15+
pytest.skip("TODO #330")
1616

1717
# Arrange
1818
n_part = 100000

tests/unit_tests/dynamics/collisions/test_sdm_multi_cell.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ class TestSDMMultiCell: # pylint: disable=too-few-public-methods
1616
@pytest.mark.parametrize("n_sd", [2, 3, 8000])
1717
@pytest.mark.parametrize("adaptive", [False, True])
1818
def test_coalescence_call(n_sd, backend_class, adaptive):
19-
# TODO #330
2019
if backend_class is ThrustRTC:
21-
return
20+
pytest.skip("TODO #330")
2221

2322
# Arrange
2423
n = np.ones(n_sd)

tests/unit_tests/impl/test_particle_attributes.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ def test_permutation_global_as_implemented_in_numba():
172172

173173
@staticmethod
174174
def test_permutation_local(backend_class):
175-
if backend_class is GPU: # TODO #358
176-
return
175+
if backend_class is GPU:
176+
pytest.skip("TODO #358")
177177
n_sd = 8
178178
u01 = [0.1, 0.4, 0.2, 0.5, 0.9, 0.1, 0.6, 0.3]
179179
cell_start = [0, 0, 2, 5, 7, n_sd]
@@ -203,7 +203,7 @@ def test_permutation_local(backend_class):
203203
@staticmethod
204204
def test_permutation_global_repeatable(backend_class):
205205
if backend_class is ThrustRTC:
206-
return # TODO #328
206+
pytest.skip("TODO #328")
207207

208208
n_sd = 800
209209
u01 = np.random.random(n_sd)
@@ -233,8 +233,8 @@ def test_permutation_global_repeatable(backend_class):
233233

234234
@staticmethod
235235
def test_permutation_local_repeatable(backend_class):
236-
if backend_class is GPU: # TODO #358
237-
return
236+
if backend_class is GPU:
237+
pytest.skip("TODO #358")
238238
n_sd = 800
239239
idx = range(n_sd)
240240
u01 = np.random.random(n_sd)

0 commit comments

Comments
 (0)