diff --git a/scripts/firedrake-check b/scripts/firedrake-check index 7aea8faee5..deeb73ca6e 100644 --- a/scripts/firedrake-check +++ b/scripts/firedrake-check @@ -24,6 +24,10 @@ TESTS = { # near nullspace "tests/firedrake/regression/test_nullspace.py::test_near_nullspace", ), + 2: ( + # HDF5/checkpointing + "tests/firedrake/output/test_io_function.py::test_io_function_base[cell_family_degree2]", + ), 3: ( "tests/firedrake/regression/test_dg_advection.py::test_dg_advection_icosahedral_sphere[nprocs=3]", # vertex-only mesh diff --git a/setup.py b/setup.py index d601613b53..27015d23cc 100644 --- a/setup.py +++ b/setup.py @@ -229,6 +229,7 @@ def extensions(): "tests/firedrake/regression/test_nullspace.py", "tests/firedrake/regression/test_dg_advection.py", "tests/firedrake/regression/test_interpolate_cross_mesh.py", + "tests/firedrake/output/test_io_function.py", ) diff --git a/tests/firedrake/output/test_hdf5file_checkpoint.py b/tests/firedrake/output/test_hdf5file_checkpoint.py index 22bfc453cd..5d8cf7436d 100644 --- a/tests/firedrake/output/test_hdf5file_checkpoint.py +++ b/tests/firedrake/output/test_hdf5file_checkpoint.py @@ -38,7 +38,8 @@ def f(): return f -def run_write_read(mesh, fs, degree, dumpfile): +@pytest.mark.parallel([1, 2]) +def test_write_read(mesh, fs, degree, dumpfile): V = FunctionSpace(mesh, fs, degree) @@ -79,15 +80,6 @@ def test_checkpoint_fails_for_non_function(dumpfile): h5.write(np.arange(10), "/solution") -def test_write_read(mesh, fs, degree, dumpfile): - run_write_read(mesh, fs, degree, dumpfile) - - -@pytest.mark.parallel(nprocs=2) -def test_write_read_parallel(mesh, fs, degree, dumpfile): - run_write_read(mesh, fs, degree, dumpfile) - - def test_checkpoint_read_not_exist_ioerror(dumpfile): with pytest.raises(IOError): with HDF5File(dumpfile, file_mode="r"): diff --git a/tests/firedrake/output/test_io_function.py b/tests/firedrake/output/test_io_function.py index e84d778733..7ec2f0c900 100644 --- a/tests/firedrake/output/test_io_function.py +++ b/tests/firedrake/output/test_io_function.py @@ -148,7 +148,7 @@ def _load_check_save_functions(filename, func_name, comm, method, mesh_name, var afile.save_function(fB) -@pytest.mark.parallel(nprocs=2) +@pytest.mark.parallel(2) @pytest.mark.parametrize('cell_family_degree', [ ("triangle_small", "P", 1), ("triangle_small", "P", 6),