From: Brian Warner Date: Tue, 31 Mar 2015 16:30:17 +0000 (-0700) Subject: test_ftp: fix comparison against integer X-Git-Tag: allmydata-tahoe-1.10.1a1~49^2~2 X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/%22doc.html/...?a=commitdiff_plain;h=b36903d02c8f9efbb5ac629c074075f7008e9051;p=tahoe-lafs%2Ftahoe-lafs.git test_ftp: fix comparison against integer --- diff --git a/src/allmydata/test/test_ftp.py b/src/allmydata/test/test_ftp.py index c98a3209..d3e3082b 100644 --- a/src/allmydata/test/test_ftp.py +++ b/src/allmydata/test/test_ftp.py @@ -79,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)