Skip to content

Commit e114588

Browse files
committed
attempt to fix concurrent tests
1 parent 480e97b commit e114588

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

tests/conftest.py

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
import pytest
22

33

4-
@pytest.fixture(scope="module")
5-
def filepath_h5mu(tmpdir_factory):
6-
return str(tmpdir_factory.mktemp("tmp_test_dir").join("testA.h5mu"))
4+
@pytest.fixture
5+
def filepath_h5mu(tmp_path):
6+
return tmp_path / "testA.h5mu"
77

88

9-
@pytest.fixture(scope="module")
10-
def filepath2_h5mu(tmpdir_factory):
11-
return str(tmpdir_factory.mktemp("tmp_test_dir").join("testB.h5mu"))
9+
@pytest.fixture
10+
def filepath2_h5mu(tmp_path):
11+
return tmp_path / "testB.h5mu"
1212

1313

14-
@pytest.fixture(scope="module")
15-
def filepath_hdf5(tmpdir_factory):
16-
return str(tmpdir_factory.mktemp("tmp_mofa_dir").join("mofa_pytest.hdf5"))
14+
@pytest.fixture
15+
def filepath_zarr(tmp_path):
16+
return tmp_path / "testA.zarr"
1717

1818

19-
@pytest.fixture(scope="module")
20-
def filepath_zarr(tmpdir_factory):
21-
return str(tmpdir_factory.mktemp("tmp_test_dir").join("testA.zarr"))
22-
23-
24-
@pytest.fixture(scope="module")
25-
def filepath2_zarr(tmpdir_factory):
26-
return str(tmpdir_factory.mktemp("tmp_test_dir").join("testB.zarr"))
19+
@pytest.fixture
20+
def filepath2_zarr(tmp_path):
21+
return tmp_path / "testB.zarr"

tests/test_io.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def mdata():
1818
)
1919

2020

21-
@pytest.mark.usefixtures("filepath_h5mu", "filepath_zarr")
2221
class TestMuData:
2322
def test_write_read_h5mu_basic(self, mdata, filepath_h5mu):
2423
mdata.write(filepath_h5mu)

0 commit comments

Comments
 (0)