Skip to content

Modify skip condition for tests not involving MPI to include compile-time and runtime check #3209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oskooi merged 2 commits into from
Apr 28, 2026
Merged

Modify skip condition for tests not involving MPI to include compile-time and runtime check #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7dc92
modify skip condition for tests not involving MPI to include compile-…
oskooi Apr 26, 2026
6500e70
add missing parentheses
oskooi Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions python/tests/test_dump_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ def get_field_point(sim):
def test_load_dump_structure_2d(self):
self._load_dump_structure_2d()

@unittest.skipIf(not mp.with_mpi(), "MPI specific test")
@unittest.skipIf(
not mp.with_mpi() or mp.count_processors() < 2,
"MPI specific test (requires mpirun with more than 1 process)",
)
def test_load_dump_structure_sharded_2d(self):
self._load_dump_structure_2d(single_parallel_file=False)

Expand Down Expand Up @@ -226,7 +229,10 @@ def get_field_point(sim):
def test_load_dump_structure_3d(self):
self._load_dump_structure_3d()

@unittest.skipIf(not mp.with_mpi(), "MPI specific test")
@unittest.skipIf(
not mp.with_mpi() or mp.count_processors() < 2,
"MPI specific test (requires mpirun with more than 1 process)",
)
def test_load_dump_structure_sharded_3d(self):
self._load_dump_structure_3d(single_parallel_file=False)

Expand Down Expand Up @@ -348,7 +354,10 @@ def get_field_point(sim):
def test_load_dump_fields_2d(self):
self._load_dump_fields_2d()

@unittest.skipIf(not mp.with_mpi(), "MPI specific test")
@unittest.skipIf(
not mp.with_mpi() or mp.count_processors() < 2,
"MPI specific test (requires mpirun with more than 1 process)",
)
def test_load_dump_fields_sharded_2d(self):
self._load_dump_fields_2d(single_parallel_file=False)

Expand Down Expand Up @@ -468,7 +477,10 @@ def get_field_point(sim):
def test_load_dump_fields_3d(self):
self._load_dump_fields_3d()

@unittest.skipIf(not mp.with_mpi(), "MPI specific test")
@unittest.skipIf(
not mp.with_mpi() or mp.count_processors() < 2,
"MPI specific test (requires mpirun with more than 1 process)",
)
def test_load_dump_fields_sharded_3d(self):
self._load_dump_fields_3d(single_parallel_file=False)

Expand Down
7 changes: 5 additions & 2 deletions python/tests/test_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,12 @@ def init_simple_simulation(self, **kwargs):
**kwargs,
)

@unittest.skipIf(not mp.with_mpi(), "MPI specific test")
@unittest.skipIf(
not mp.with_mpi() or mp.count_processors() < 2,
"MPI specific test (requires mpirun with more than 1 process)",
)
def test_mpi(self):
self.assertGreater(mp.comm.Get_size(), 1)
self.assertGreater(mp.count_processors(), 1)

def test_use_output_directory_default(self):
sim = self.init_simple_simulation()
Expand Down
Loading