summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2009-05-06 09:32:48 +0000
committerrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2009-05-06 09:32:48 +0000
commit6bfb5ae164bf69b4d0730228da6b8da668550b21 (patch)
tree85e4450c10f40291367962387a57b55ae1ef689b
parenta739fee6eeda8ff4a039655a88bcc520628e5d86 (diff)
downloadpyfilesystem-6bfb5ae164bf69b4d0730228da6b8da668550b21.tar.gz
xattrs tests: ensure result from xattrs() is a list
git-svn-id: http://pyfilesystem.googlecode.com/svn/branches/rfk-ideas@142 67cdc799-7952-0410-af00-57a81ceafa0f
-rw-r--r--fs/rpcfs.py1
-rw-r--r--fs/tests.py12
2 files changed, 6 insertions, 7 deletions
diff --git a/fs/rpcfs.py b/fs/rpcfs.py
index 880379b..8db6da3 100644
--- a/fs/rpcfs.py
+++ b/fs/rpcfs.py
@@ -167,7 +167,6 @@ class RPCFS(FS):
oldclose = f.close
def newflush():
oldflush()
- print "SENDING:", f.getvalue()
self.proxy.set_contents(path,xmlrpclib.Binary(f.getvalue()))
def newclose():
f.flush()
diff --git a/fs/tests.py b/fs/tests.py
index 7bee141..28a5bbf 100644
--- a/fs/tests.py
+++ b/fs/tests.py
@@ -461,15 +461,15 @@ class XAttrTestCases:
def test_list_xattrs(self):
def do_list(p):
- self.assertEquals(self.fs.xattrs(p),[])
+ self.assertEquals(sorted(self.fs.xattrs(p)),[])
self.fs.setxattr(p,"xattr1","value1")
- self.assertEquals(self.fs.xattrs(p),["xattr1"])
+ self.assertEquals(sorted(self.fs.xattrs(p)),["xattr1"])
self.fs.setxattr(p,"attr2","value2")
self.assertEquals(sorted(self.fs.xattrs(p)),["attr2","xattr1"])
self.fs.delxattr(p,"xattr1")
- self.assertEquals(self.fs.xattrs(p),["attr2"])
+ self.assertEquals(sorted(self.fs.xattrs(p)),["attr2"])
self.fs.delxattr(p,"attr2")
- self.assertEquals(self.fs.xattrs(p),[])
+ self.assertEquals(sorted(self.fs.xattrs(p)),[])
self.fs.createfile("test.txt","hello")
do_list("test.txt")
self.fs.makedir("mystuff")
@@ -729,8 +729,8 @@ class TestS3FS(unittest.TestCase,FSTestCases):
bucket = "test-s3fs.rfk.id.au"
def setUp(self):
- import nose
- raise nose.SkipTest
+ #import nose
+ #raise nose.SkipTest
self.fs = s3fs.S3FS(self.bucket,"/unittest/files")
self._clear()