removing warnings, adding markers to tests

Author: pancetta

pySDC/projects/node_failure/boussinesq_example.py

@@ -125,7 +125,7 @@ def main(ft_strategies):
         for k, v in extract_stats.items():
             step = k.process
             iter = k.iter
-            if iter is not -1:
+            if iter != -1:
                 residual[iter - 1, step] = np.log10(v)
 
         # stats magic: get niter (probably redundant with maxiter)

pySDC/projects/node_failure/grayscott_example.py

@@ -122,7 +122,7 @@ def main(ft_strategies):
         for k, v in extract_stats.items():
             step = k.process
             iter = k.iter
-            if iter is not -1:
+            if iter != -1:
                 residual[iter - 1, step] = np.log10(v)
 
         # stats magic: get niter (probably redundant with maxiter)

pySDC/projects/node_failure/hard_faults_detail.py

@@ -140,7 +140,7 @@ def main(ft_setups, ft_strategies):
             for k, v in extract_stats.items():
                 step = k.process
                 iter = k.iter
-                if iter is not -1:
+                if iter != -1:
                     residual[iter - 1, step] = np.log10(v)
             print('')
             np.savez('data/' + setup + '_steps_vs_iteration_hf_' + strategy, residual=residual, ft_step=ft.hard_step,

pySDC/tests/test_projects/test_AC/test_simple_forcing.py

@@ -1,10 +1,13 @@
+import pytest
 import subprocess
 from pySDC.projects.AllenCahn_Bayreuth.run_simple_forcing_verification import main, visualize_radii
 
 def test_main_serial():
     main()
     visualize_radii()
 
+@pytest.mark.slow
+@pytest.mark.parallel
 def test_main_parallel():
 
     # try to import MPI here, will fail if things go wrong (and not later on in the subprocess part)

pySDC/tests/test_projects/test_TOMS/test_AllenCahn_contracting_circle.py

@@ -1,5 +1,7 @@
-from pySDC.projects.TOMS.AllenCahn_contracting_circle import main
+import pytest
 
+from pySDC.projects.TOMS.AllenCahn_contracting_circle import main
 
+@pytest.mark.slow
 def test_AllenCahn_contracting_circle():
     main(cwd='pySDC/projects/TOMS/')

pySDC/tests/test_projects/test_hamiltonian/test_simple.py

@@ -1,4 +1,7 @@
+import pytest
+
 from pySDC.projects.Hamiltonian.simple_problems import main
 
+@pytest.mark.slow
 def test_main():
     main()

pySDC/tests/test_projects/test_parallelSDC/test_preconditioner_MPI.py

@@ -1,6 +1,9 @@
 import os
 import subprocess
+import pytest
 
+@pytest.mark.slow
+@pytest.mark.parallel
 def test_preconditioner_playground_MPI_5():
     # Set python path once
     my_env = os.environ.copy()
@@ -14,6 +17,8 @@ def test_preconditioner_playground_MPI_5():
                               (p.returncode, num_procs)
 
 
+@pytest.mark.slow
+@pytest.mark.parallel
 def test_preconditioner_playground_MPI_3():
     # Set python path once
     my_env = os.environ.copy()

pySDC/tests/test_tutorials/test_step_6.py

@@ -1,4 +1,5 @@
 import pkg_resources
+import pytest
 
 from pySDC.tutorial.step_6.A_run_non_MPI_controller import main as main_A
 from pySDC.tutorial.step_6.B_odd_temporal_distribution import main as main_B
@@ -12,6 +13,7 @@ def test_A():
 def test_B():
     main_B()
 
+@pytest.mark.parallel
 def test_C():
     installed_packages = [d for d in pkg_resources.working_set]
     flat_installed_packages = [package.project_name for package in installed_packages]

pySDC/tests/test_tutorials/test_step_7.py

@@ -13,7 +13,7 @@ def test_A():
 def test_B():
     main_B()
 
-
+@pytest.mark.parallel
 def test_C_1x1():
     # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
     import mpi4py
@@ -35,7 +35,7 @@ def test_C_1x1():
     assert p.returncode == 0, 'ERROR: did not get return code 0, got %s with %2i processes' % \
                               (p.returncode, num_procs)
 
-
+@pytest.mark.parallel
 def test_C_1x2():
     # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
     import mpi4py
@@ -56,6 +56,7 @@ def test_C_1x2():
     assert p.returncode == 0, 'ERROR: did not get return code 0, got %s with %2i processes' % \
                               (p.returncode, num_procs)
 
+@pytest.mark.parallel
 def test_C_2x2():
     # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
     import mpi4py

pytest.ini

@@ -2,3 +2,4 @@
 markers =
     fenics: tests relying on FEniCS
     slow: tests taking much longer than bearable
+    parallel: tests using MPI parallelism