removed Popen wait and use communicate then get return code

tests/test_basic/test_basic.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_cmfd_feed/test_cmfd_feed.py

@@ -29,9 +29,9 @@ def test_run():
                      stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     output = proc.communicate()[0]
     print(output)
+    returncode = proc.returncode
     if 'CMFD is not available' in output:
         global skipAll
         skipAll = True

tests/test_cmfd_jfnk/test_cmfd_jfnk.py

@@ -29,9 +29,9 @@ def test_run():
                      stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     output = proc.communicate()[0]
     print(output)
+    returncode = proc.returncode
     if 'CMFD is not available' in output:
         global skipAll
         skipAll = True

tests/test_cmfd_nofeed/test_cmfd_nofeed.py

@@ -28,9 +28,9 @@ def test_run():
                      stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     output = proc.communicate()[0]
     print(output)
+    returncode = proc.returncode
     if 'CMFD is not available' in output:
         global skipAll
         skipAll = True

tests/test_compile/test_compile.py

@@ -273,8 +273,8 @@ def test_mpi_omp_hdf5_petsc_optimize():
 
 def run(commands):
     proc = Popen(commands, stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     return returncode
 
 

tests/test_confidence_intervals/test_confidence_intervals.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_density_atombcm/test_density_atombcm.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_density_atomcm3/test_density_atomcm3.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_density_kgm3/test_density_kgm3.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_density_sum/test_density_sum.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_energy_grid/test_energy_grid.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_entropy/test_entropy.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_cell/test_filter_cell.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_cellborn/test_filter_cellborn.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_energy/test_filter_energy.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_energyout/test_filter_energyout.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_group_transfer/test_filter_group_transfer.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_material/test_filter_material.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_mesh_2d/test_filter_mesh_2d.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_mesh_3d/test_filter_mesh_3d.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_filter_universe/test_filter_universe.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_fixed_source/test_fixed_source.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_lattice/test_lattice.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_lattice_multiple/test_lattice_multiple.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_natural_element/test_natural_element.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_output/test_output.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_summary_exists():

tests/test_plot_background/test_plot_background.py

@@ -17,8 +17,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path, '-p'], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_plot_exists():

tests/test_plot_basis/test_plot_basis.py

@@ -17,8 +17,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path, '-p'], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_plots_exists():

tests/test_plot_colspec/test_plot_colspec.py

@@ -17,8 +17,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path, '-p'], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_plot_exists():

tests/test_plot_mask/test_plot_mask.py

@@ -17,8 +17,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path, '-p'], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_plots_exists():

tests/test_ptables_off/test_ptables_off.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_reflective_cone/test_reflective_cone.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_reflective_cylinder/test_reflective_cylinder.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_reflective_plane/test_reflective_plane.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_reflective_sphere/test_reflective_sphere.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_rotation/test_rotation.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_salphabeta/test_salphabeta.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_salphabeta_multiple/test_salphabeta_multiple.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_MT/test_score_MT.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_absorption/test_score_absorption.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_current/test_score_current.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_events/test_score_events.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_fission/test_score_fission.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_flux/test_score_flux.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_kappafission/test_score_kappafission.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_nufission/test_score_nufission.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_nuscatter/test_score_nuscatter.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_scatter/test_score_scatter.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_scatter_n/test_score_scatter_n.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_scatter_pn/test_score_scatter_pn.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_score_total/test_score_total.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_seed/test_seed.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_source_angle_mono/test_source_angle_mono.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_source_energy_maxwell/test_source_energy_maxwell.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_source_energy_mono/test_source_energy_mono.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_source_point/test_source_point.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_statepoint_batch/test_statepoint_batch.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_statepoints_exist():

tests/test_statepoint_interval/test_statepoint_interval.py

@@ -20,8 +20,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_statepoints_exist():

tests/test_statepoint_restart/test_statepoint_restart.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():
@@ -45,8 +45,8 @@ def test_restart_form1():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path, '-r', statepoint[0]], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint_form1():
@@ -72,8 +72,8 @@ def test_restart_form2():
     else:
         proc = Popen([openmc_path, '--restart', statepoint[0]], 
                      stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint_form2():
@@ -94,8 +94,8 @@ def test_restart_serial():
     openmc_path = pwd + '/../../src/openmc'
     proc = Popen([openmc_path, '--restart', statepoint[0]], 
                  stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint_serial():

tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_statepoint_exists():

tests/test_survival_biasing/test_survival_biasing.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_tally_assumesep/test_tally_assumesep.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_trace/test_trace.py

@@ -19,9 +19,9 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     stdout = proc.communicate()[0]
     print(stdout)
+    returncode = proc.returncode
     assert returncode == 0
     assert stdout.find('Simulating Particle 453') != -1
 

tests/test_translation/test_translation.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_uniform_fs/test_uniform_fs.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_universe/test_universe.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():

tests/test_void/test_void.py

@@ -19,8 +19,8 @@ def test_run():
                stderr=STDOUT, stdout=PIPE)
     else:
         proc = Popen([openmc_path], stderr=STDOUT, stdout=PIPE)
-    returncode = proc.wait()
     print(proc.communicate()[0])
+    returncode = proc.returncode
     assert returncode == 0
 
 def test_created_statepoint():