From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 8 Oct 2015 11:20:35 +0000 (+0200)
Subject: tests: close files
X-Git-Tag: 0.5.0~47
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00bd75aa8cb905a94cd4b931f31cdf1342e25495;p=fdroidserver.git

tests: close files
---

diff --git a/tests/build.TestCase b/tests/build.TestCase
index 5bb0bd36..ee26932b 100755
--- a/tests/build.TestCase
+++ b/tests/build.TestCase
@@ -63,11 +63,13 @@ class BuildTest(unittest.TestCase):
                   'source-files/Zillode/syncthing-silk/build.gradle',
                   'source-files/open-keychain/open-keychain/build.gradle',
                   'source-files/osmandapp/osmand/build.gradle'):
-            filedata = open(os.path.join(testsdir, f)).read()
+            with open(os.path.join(testsdir, f), 'r') as f:
+                filedata = f.read()
             self.assertIsNotNone(pattern.search(filedata))
         tp = os.path.join(testsdir,
                           'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle')
-        filedata = open(tp).read()
+        with open(tp, 'r') as f:
+            filedata = f.read()
         self.assertIsNone(pattern.search(filedata))
 
 if __name__ == "__main__":
diff --git a/tests/common.TestCase b/tests/common.TestCase
index 9f80c1df..4e602aac 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -140,10 +140,12 @@ class CommonTest(unittest.TestCase):
 
         fdroidserver.common.prepare_source(FakeVcs(), app, build, testdir, testdir, testdir)
 
-        filedata = open(os.path.join(testdir, 'build.gradle')).read()
+        with open(os.path.join(testdir, 'build.gradle'), 'r') as f:
+            filedata = f.read()
         self.assertIsNotNone(re.search("\s+compileSdkVersion %s\s+" % testint, filedata))
 
-        filedata = open(os.path.join(testdir, 'AndroidManifest.xml')).read()
+        with open(os.path.join(testdir, 'AndroidManifest.xml')) as f:
+            filedata = f.read()
         self.assertIsNone(re.search('android:debuggable', filedata))
         self.assertIsNotNone(re.search('android:versionName="%s"' % build['version'], filedata))
         self.assertIsNotNone(re.search('android:versionCode="%s"' % build['vercode'], filedata))
diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase
index 69f4c6ed..e81d0158 100755
--- a/tests/metadata.TestCase
+++ b/tests/metadata.TestCase
@@ -39,7 +39,8 @@ class MetadataTest(unittest.TestCase):
 
         apps = fdroidserver.metadata.read_metadata(xref=True)
         for appid in ('org.smssecure.smssecure', 'org.adaway', 'net.osmand.plus', 'org.videolan.vlc'):
-            frompickle = pickle.load(open(os.path.join('metadata', appid + '.pickle')))
+            with open(os.path.join('metadata', appid + '.pickle'), 'r') as f:
+                frompickle = pickle.load(f)
             self.assertTrue(appid in apps.keys())
             self.assertEquals(apps[appid], frompickle)