Skip to content

Commit d210110

Browse files
committed
tests: scheduler fixture: return 'multiprocessing' as string
1 parent 5103271 commit d210110

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ def scheduler(request, client):
2929
if request.param == 'distributed':
3030
return client
3131
else:
32-
return multiprocessing
32+
return request.param

pmda/test/test_parallel.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ def scheduler(request, client):
102102
def test_scheduler(analysis, scheduler):
103103
analysis.run(scheduler=scheduler)
104104

105-
105+
106106
def test_nframes_less_nblocks_warning(analysis):
107107
u = mda.Universe(analysis._top, analysis._traj)
108108
n_frames = u.trajectory.n_frames
109109
with pytest.warns(UserWarning):
110110
analysis.run(stop=2, n_blocks=4, n_jobs=2)
111111
assert len(analysis.res) == 2
112-
113-
112+
113+
114114
@pytest.mark.parametrize('n_blocks', np.arange(1, 11))
115115
def test_nblocks(analysis, n_blocks):
116116
analysis.run(n_blocks=n_blocks)

0 commit comments

Comments
 (0)