Refs #92. remove work dir at the end if clean "on the fly". improved …

…tests
ornlneutronimaging · Jan 11, 2018 · ac0cba0 · ac0cba0
1 parent 85fb4cf
commit ac0cba0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/python/imars3d/CT.py b/python/imars3d/CT.py
@@ -260,11 +260,13 @@ def recon(self, workdir=None, outdir=None, tilt=None, crop_window=None,
         if remove_rings:
             self.removeRings(recon)
         # clean up
+        import shutil
         if self.clean_intermediate_files == 'archive':
-            import shutil
             import datetime
             now = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
             shutil.move(workdir, os.path.join(outdir, 'work-%s' % now))
+        elif self.clean_intermediate_files == 'on_the_fly':
+            shutil.rmtree(workdir)
         return
 
 

diff --git a/tests/workflows/recon/test_CT_travisCI.py b/tests/workflows/recon/test_CT_travisCI.py
@@ -30,17 +30,21 @@ def test(nodes):
         parallel_nodes=nodes,
     )
     ct.recon(tilt=-1.40, explore_rot_center=False)
+    assert not os.path.exists('work')
     return
 
 def test2(nodes):
     ct = CT(
         dir,
-        clean_on_the_fly='archive', 
+        clean_intermediate_files='archive',
         vertical_range=slice(900, 1000),
         parallel_nodes=nodes,
         skip_df = True
     )
     ct.recon(tilt=-1.40, explore_rot_center=False)
+    assert not os.path.exists('work')
+    import glob
+    assert glob.glob('out/work-*')
     return
 
 def test3(nodes):
@@ -51,6 +55,7 @@ def test3(nodes):
         parallel_nodes=nodes,
     )
     ct.recon(tilt=-1.40, explore_rot_center=False)
+    assert os.path.exists('work')
     return