Clean up & tweak failing sftp closure test

1 files changed, 4 insertions, 9 deletions

diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index 58013cfd..a35914e1 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -203,7 +203,10 @@ class SFTPTest (unittest.TestCase):
         with sftp:
             pass
         try:
-            self._assert_opening_file_raises_error(sftp)
+            sftp.open(FOLDER + '/test2', 'w')
+            self.fail('expected exception')
+        except EOFError, socket.error:
+            pass
         finally:
             sftp = paramiko.SFTP.from_transport(tc)
 
@@ -808,14 +811,6 @@ class SFTPTest (unittest.TestCase):
             sftp.remove('%s/nonutf8data' % FOLDER)
 
 
-    def _assert_opening_file_raises_error(self, sftp):
-        try:
-            sftp.open(FOLDER + '/test2', 'w')
-            self.fail('expected exception')
-        except EOFError:
-            pass
-
-
 if __name__ == '__main__':
     SFTPTest.init_loopback()
     # logging is required by test_N_file_with_percent