del butler. remove dir in a separate function

lsst-dm · Jun 2, 2017 · 3ef808b · 3ef808b
1 parent d7760a4
commit 3ef808b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tests/butlerProxy.py b/tests/butlerProxy.py
@@ -44,14 +44,18 @@ class ButlerProxyTestCase(unittest.TestCase):
     inputDir = os.path.join(ROOT, 'root')
     outputDir = os.path.join(ROOT, 'ButlerProxyTestCase')
 
+    def removeTestDir(self):
+        if os.path.exists(self.outputDir):
+            shutil.rmtree(self.outputDir)
+
     def setUp(self):
-        self.tearDown()
+        self.removeTestDir()
         self.butler = dafPersist.Butler(self.inputDir,
                                         outPath=os.path.join(self.outputDir, "proxyOut"))
 
     def tearDown(self):
-        if os.path.exists(self.outputDir):
-            shutil.rmtree(self.outputDir)
+        del self.butler
+        self.removeTestDir()
 
     def testCheckProxy(self):
         """Attempt to cycle a DateTime object through the butler
@@ -98,13 +102,15 @@ def testCheckProxy(self):
         self.assertIsInstance(dt, dafPersist.readProxy.ReadProxy)
         self.assertFalse(isValidDateTime(dt))
 
+
 class TestMemory(lsst.utils.tests.MemoryTestCase):
     pass
 
 
 def setup_module(module):
     lsst.utils.tests.init()
 
+
 if __name__ == "__main__":
     lsst.utils.tests.init()
     unittest.main()