Refactor unit test writeFile/readFile helpers.

gitosis/test/test_ssh.py

@@ -4,16 +4,7 @@ import os
 from cStringIO import StringIO
 
 from gitosis import ssh
-from gitosis.test.util import mkdir, maketemp
+from gitosis.test.util import mkdir, maketemp, writeFile, readFile
-
-def writeFile(path, content):
-    tmp = '%s.tmp' % path
-    f = file(tmp, 'w')
-    try:
-        f.write(content)
-    finally:
-        f.close()
-    os.rename(tmp, path)
 
 def _key(s):
     return ''.join(s.split('\n')).strip()
@@ -174,12 +165,7 @@ baz
         ssh.writeAuthorizedKeys(
             path=path, keydir=keydir)
 
-        f = file(path)
+        got = readFile(path)
-        try:
-            got = f.read()
-        finally:
-            f.close()
-
         eq(got, '''\
 # foo
 bar

gitosis/test/util.py

@@ -16,3 +16,20 @@ def maketemp():
     tmp = os.path.join(tmp, me)
     mkdir(tmp)
     return tmp
+
+def writeFile(path, content):
+    tmp = '%s.tmp' % path
+    f = file(tmp, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    os.rename(tmp, path)
+
+def readFile(path):
+    f = file(path)
+    try:
+        data = f.read()
+    finally:
+        f.close()
+    return data