From fb13d4d6ea63c92cc97e81d61a556de8001b4ba1 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 4 Feb 2013 19:34:23 -0200
Subject: Close file handles.

---
 src/leap/soledad/__init__.py             | 1 -
 src/leap/soledad/tests/test_couch.py     | 8 +++++---
 src/leap/soledad/tests/test_sqlcipher.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index c9c981c2..688ee160 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -66,7 +66,6 @@ class Soledad(object):
         try:
             with open(self.SECRET_PATH) as f:
                 self._secret = str(self._gpg.decrypt(f.read()))
-                f.close()
         except IOError:
             raise IOError('Failed to open secret file %s.' % self.SECRET_PATH)
 
diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py
index b5d6378c..6eb5501c 100644
--- a/src/leap/soledad/tests/test_couch.py
+++ b/src/leap/soledad/tests/test_couch.py
@@ -42,6 +42,7 @@ class CouchDBWrapper(object):
         conf = handle.read() % {
             'tempdir': self.tempdir,
         }
+        handle.close()
 
         confPath = os.path.join(self.tempdir, 'test.ini')
         handle = open(confPath, 'w')
@@ -51,10 +52,10 @@ class CouchDBWrapper(object):
         # create the dirs from the template
         os.mkdir(os.path.join(self.tempdir, 'lib'))
         os.mkdir(os.path.join(self.tempdir, 'log'))
-        argus = ['couchdb', '-n' '-a', confPath]
-        null = open('/dev/null', 'w')
+        args = ['couchdb', '-n' '-a', confPath]
+        #null = open('/dev/null', 'w')
         self.process = subprocess.Popen(
-            argus, env=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            args, env=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         # find port
         logPath = os.path.join(self.tempdir, 'log', 'couch.log')
         while not os.path.exists(logPath):
@@ -75,6 +76,7 @@ stderr:
 
         handle = open(logPath)
         line = handle.read()
+        handle.close()
         m = PORT_RE.search(line)
         if not m:
             self.stop()
diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 0d5d00ee..18b9173e 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -3,7 +3,7 @@
 import os
 import time
 from sqlite3 import dbapi2, DatabaseError
-import unittest2 as unittest
+import unittest
 from StringIO import StringIO
 import threading
 
-- 
cgit v1.2.3