test_ftp: fix comparison against integer

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_ftp.py

diff --git a/src/allmydata/test/test_ftp.py b/src/allmydata/test/test_ftp.py
index 64f78738a57dddfe1be5219a6a550f3ef79c28f3..d3e3082baa9192c1b3f5532bca2654aed9f3dc5c 100644 (file)
--- a/src/allmydata/test/test_ftp.py
+++ b/src/allmydata/test/test_ftp.py
@@ -1,6 +1,4 @@
 
-import time, calendar
-
 from twisted.trial import unittest
 
 from allmydata.frontends import ftpd
@@ -81,6 +79,11 @@ class Handler(GridTestMixin, ReallyEqualMixin, unittest.TestCase):
                                        actual_list, expected_list))
         for (a, b) in zip(actual_list, expected_list):
            (name, meta) = a
+           # convert meta.permissions to int for comparison. When we run
+           # against many (but not all) versions of Twisted, this is a
+           # filepath.Permissions object, not an int
+           meta = list(meta)
+           meta[2] = meta[2] & 0xffffffff
            (expected_name, expected_meta) = b
            self.failUnlessReallyEqual(name, expected_name)
            self.failUnlessReallyEqual(meta, expected_meta)