clean up temp dir names, to match test class names

lsst-dm · Aug 18, 2017 · 9344225 · 9344225
1 parent e4d5b8b
commit 9344225
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/tests/test_reposInButler.py b/tests/test_reposInButler.py
@@ -1,4 +1,4 @@
-#
+    #
 # LSST Data Management System
 # Copyright 2016 LSST Corporation.
 #
@@ -100,7 +100,7 @@ def map_str(self, dataId, write):
 class ReposInButler(unittest.TestCase):
 
     def setUp(self):
-        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='repoOfRepos-')
+        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='ReposInButler-')
 
     def tearDown(self):
         if os.path.exists(self.testDir):

diff --git a/tests/test_repository.py b/tests/test_repository.py
@@ -768,8 +768,7 @@ class TestParentRepository(unittest.TestCase):
     """A test to verify that when a parent repository is used the correct one is found."""
 
     def setUp(self):
-        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix="TestBasics-")
-        self.testDir = os.path.join(self.testDir, 'TestParentRepository')
+        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix="TestParentRepository-")
 
     def tearDown(self):
         if os.path.exists(self.testDir):

diff --git a/tests/test_repositoryCfg.py b/tests/test_repositoryCfg.py
@@ -40,7 +40,7 @@ class TestCfgRelationship(unittest.TestCase):
 
     def setUp(self):
         self.testDir = tempfile.mkdtemp(dir=ROOT,
-                                        prefix="repositoryCfg-")
+                                        prefix="TestCfgRelationship-")
 
     def tearDown(self):
         if os.path.exists(self.testDir):
@@ -167,11 +167,12 @@ def testStorageRepoCfgCache(self):
         cfg = storage.getRepositoryCfg(os.path.join(self.testDir, 'a'))
         self.assertEqual(cfg, storage.repositoryCfgs[os.path.join(self.testDir, 'a')])
 
+
 class TestNestedCfg(unittest.TestCase):
 
     def setUp(self):
         self.testDir = tempfile.mkdtemp(dir=ROOT,
-                                        prefix="repositoryCfg_TestNestedCfg-")
+                                        prefix="TestNestedCfg-")
 
     def tearDown(self):
         if os.path.exists(self.testDir):
@@ -217,7 +218,7 @@ class TestCfgFileVersion(unittest.TestCase):
 
     def setUp(self):
         self.testDir = tempfile.mkdtemp(dir=ROOT,
-                                        prefix="repositoryCfg-")
+                                        prefix="TestCfgFileVersion-")
 
     def tearDown(self):
         if os.path.exists(self.testDir):

diff --git a/tests/test_safeFileIo.py b/tests/test_safeFileIo.py
@@ -44,7 +44,7 @@ def setup_module(module):
 class WriteOnceCompareSameTest(unittest.TestCase):
 
     def setUp(self):
-        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='safeFileIo-')
+        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='WriteOnceCompareSameTest-')
 
     def tearDown(self):
         if os.path.exists(self.testDir):
@@ -154,7 +154,7 @@ class TestOneThousandWriters(unittest.TestCase):
     system."""
 
     def setUp(self):
-        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='TestOneThousandWriters')
+        self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='TestOneThousandWriters-')
 
     def tearDown(self):
         if os.path.exists(self.testDir):