summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorgcode@loowis.durge.org <gcode@loowis.durge.org@67cdc799-7952-0410-af00-57a81ceafa0f>2012-08-13 23:50:12 +0000
committergcode@loowis.durge.org <gcode@loowis.durge.org@67cdc799-7952-0410-af00-57a81ceafa0f>2012-08-13 23:50:12 +0000
commitd59a6dfc9802434fc2f55bca6b9bf6cab98c6114 (patch)
tree1d2d90fbf0f707c9d1b95840567e36c10184ed91 /fs
parent93dc475b085b318e96ad1e2047580968e692c3ed (diff)
downloadpyfilesystem-d59a6dfc9802434fc2f55bca6b9bf6cab98c6114.tar.gz
Re-enable the SFTP nosetests. Seems like the latest version of paramiko no
longer has the problems we were encountering before. Also required a quick fix to SFTPFS.removeddir(..., recursive=True) git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@806 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs')
-rw-r--r--fs/sftpfs.py3
-rw-r--r--fs/tests/test_expose.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/sftpfs.py b/fs/sftpfs.py
index eb12c3e..e5f181b 100644
--- a/fs/sftpfs.py
+++ b/fs/sftpfs.py
@@ -545,7 +545,8 @@ class SFTPFS(FS):
raise
if recursive:
try:
- self.removedir(dirname(path),recursive=True)
+ if dirname(path) not in ('', '/'):
+ self.removedir(dirname(path),recursive=True)
except DirectoryNotEmptyError:
pass
diff --git a/fs/tests/test_expose.py b/fs/tests/test_expose.py
index f59a449..e052e6c 100644
--- a/fs/tests/test_expose.py
+++ b/fs/tests/test_expose.py
@@ -127,7 +127,6 @@ except ImportError:
class TestSFTPFS(TestRPCFS):
__test__ = not PY3
- __test__ = False
def makeServer(self,fs,addr):
return BaseSFTPServer(addr,fs)