replace shutil.rmtree with meep.delete_directory

python/tests/chunks.py

@@ -1,16 +1,13 @@
 import unittest
 import meep as mp
-import shutil
 
 class TestChunks(unittest.TestCase):
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def test_chunks(self):
         sxy = 10

python/tests/cyl_ellipsoid.py

@@ -2,7 +2,6 @@
 
 import unittest
 import meep as mp
-import shutil
 
 def dummy_eps(vec):
     return 1.0
@@ -13,12 +12,10 @@ class TestCylEllipsoid(unittest.TestCase):
     ref_Hz = -4.5623185899766e-5
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def init(self):
 

python/tests/dft_fields.py

@@ -3,17 +3,14 @@
 import numpy as np
 import meep as mp
 import os
-import shutil
 
 class TestDFTFields(unittest.TestCase):
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def init(self):
         resolution = 10

python/tests/dispersive_eigenmode.py

@@ -14,7 +14,6 @@
 from meep import mpb
 import h5py
 import os
-import shutil
 
 class TestDispersiveEigenmode(unittest.TestCase):
     # ----------------------------------------- #
@@ -40,12 +39,10 @@ def call_chi1(self,material,omega):
         np.testing.assert_allclose(n,n_actual)
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def verify_output_and_slice(self,material,omega):
         # Since the slice routines average the diagonals, we need to do that too:

python/tests/field_functions.py

@@ -1,6 +1,5 @@
 import unittest
 import meep as mp
-import shutil
 
 def f(r, ex, hz, eps):
     return (r.x * r.norm() + ex) - (eps * hz)
@@ -16,12 +15,10 @@ class TestFieldFunctions(unittest.TestCase):
     vol = mp.Volume(size=mp.Vector3(1), center=mp.Vector3())
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def init(self):
         resolution = 20

python/tests/holey_wvg_cavity.py

@@ -1,7 +1,6 @@
 import unittest
 import meep as mp
 import numpy as np
-import shutil
 
 class TestHoleyWvgCavity(unittest.TestCase):
 
@@ -41,9 +40,7 @@ def setUp(self):
         self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def test_resonant_modes(self):
         self.sim.sources = [mp.Source(mp.GaussianSource(self.fcen, fwidth=self.df),

python/tests/mpb.py

@@ -7,7 +7,6 @@
 import sys
 import time
 import unittest
-import shutil
 
 import h5py
 import numpy as np
@@ -35,10 +34,7 @@ def setUp(self):
     def tearDown(self):
         end = time.time() - self.start
         print("{}: {:.2f}s".format(self.filename_prefix, end))
-
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def init_solver(self, geom=True):
         num_bands = 8

python/tests/pw_source.py

@@ -5,7 +5,6 @@
 import unittest
 
 import meep as mp
-import shutil
 
 class TestPwSource(unittest.TestCase):
 
@@ -57,9 +56,7 @@ def _pw_amp(x):
         self.s = s
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def test_pw_source(self):
         self.sim.run(mp.at_end(mp.output_efield_z), until=400)

python/tests/ring.py

@@ -4,17 +4,14 @@
 
 import unittest
 import meep as mp
-import shutil
 
 class TestRing(unittest.TestCase):
 
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def init(self):
         n = 3.4

python/tests/simulation.py

@@ -1,5 +1,4 @@
 import os
-import shutil
 import sys
 import unittest
 import warnings
@@ -22,9 +21,7 @@ def setUp(self):
         self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def test_interpolate_numbers(self):
 

python/tests/visualization.py

@@ -13,7 +13,6 @@
 import meep as mp
 import numpy as np
 import os
-import shutil
 
 # Make sure we have matplotlib installed
 import matplotlib
@@ -117,12 +116,10 @@ def view_sim():
     plt.show()
 class TestVisualization(unittest.TestCase):
     def setUp(self):
-      self.temp_dir = mp.make_output_directory()
+        self.temp_dir = mp.make_output_directory()
 
     def tearDown(self):
-        mp.all_wait()
-        if mp.am_master():
-            shutil.rmtree(self.temp_dir,ignore_errors=True)
+        mp.delete_directory(self.temp_dir)
 
     def test_plot2D(self):
         # Check plotting of geometry with several sources, monitors, and PMLs

tests/h5test.cpp

@@ -451,8 +451,6 @@ int main(int argc, char **argv) {
       }
 #endif /* HAVE_HDF5 */
 
-  all_wait();
-  sync();
   delete_directory(temp_dir);
 
   return 0;