Fix some warnings

* Use assertEqual rather than assertEquals * Close a file handle that was open and use "with open"
lsst-dm · Aug 18, 2017 · c3fd82c · c3fd82c
1 parent 2c0f032
commit c3fd82c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/tests/test_posixParentSearch.py b/tests/test_posixParentSearch.py
@@ -130,8 +130,8 @@ def testDoSearchParentFlag(self):
             f.write('abc')
         os.symlink('../a', os.path.join(childDir, '_parent'))
         storage = dafPersist.PosixStorage(uri=childDir, create=True)
-        self.assertEquals(storage.search(storage.root, 'foo.txt', searchParents=True), ['_parent/foo.txt'])
-        self.assertEquals(storage.search(storage.root, 'foo.txt', searchParents=False), None)
+        self.assertEqual(storage.search(storage.root, 'foo.txt', searchParents=True), ['_parent/foo.txt'])
+        self.assertEqual(storage.search(storage.root, 'foo.txt', searchParents=False), None)
 
     def testNoResults(self):
         storage = dafPersist.PosixStorage(uri=self.testDir, create=True)

diff --git a/tests/test_posixStorage.py b/tests/test_posixStorage.py
@@ -132,13 +132,13 @@ def testAbsolutePath(self):
         None when it does not exist."""
         storage = dp.PosixStorage(self.testDir, create=True)
         self.assertIsNone(storage.getLocalFile('foo.txt'))
-        f = open(os.path.join(self.testDir, 'foo.txt'), 'w')
-        f.write('foobarbaz')
-        f.close()
+        with open(os.path.join(self.testDir, 'foo.txt'), 'w') as f:
+            f.write('foobarbaz')
         del f
         f = storage.getLocalFile('foo.txt')
         self.assertIsInstance(f, FileType)
         self.assertEqual(f.read(), 'foobarbaz')
+        f.close()
 
 
 class MemoryTester(lsst.utils.tests.MemoryTestCase):

diff --git a/tests/test_repositoryCfg.py b/tests/test_repositoryCfg.py
@@ -224,10 +224,9 @@ def tearDown(self):
             shutil.rmtree(self.testDir)
 
     def test(self):
-        f = open(os.path.join(self.testDir, 'repositoryCfg.yaml'), 'w')
-        f.write("""!RepositoryCfg_v0
-                   _root: 'foo/bar'""")
-        f.close()
+        with open(os.path.join(self.testDir, 'repositoryCfg.yaml'), 'w') as f:
+            f.write("""!RepositoryCfg_v0
+                    _root: 'foo/bar'""")
         cfg = dp.PosixStorage.getRepositoryCfg(self.testDir)