From: Brian Warner <warner@lothar.com>
Date: Sat, 7 Mar 2009 09:45:18 +0000 (-0700)
Subject: test_storage: solaris doesn't appear to give the same block count as other platforms... 
X-Git-Tag: allmydata-tahoe-1.4.0~86
X-Git-Url: https://git.rkrishnan.org/listings/webapi.txt?a=commitdiff_plain;h=091cfd04cad1a2fa89b0cf44c2b7d026eea7858a;p=tahoe-lafs%2Ftahoe-lafs.git

test_storage: solaris doesn't appear to give the same block count as other platforms, so don't assert as much about 'diskbytes' recovered
---

diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index 31d7071c..7ccd2ec7 100644
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -1820,11 +1820,13 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
             self.failUnlessEqual(rec["actual-sharebytes"], size)
             self.failUnlessEqual(rec["original-leasetimer-sharebytes"], size)
             self.failUnlessEqual(rec["configured-leasetimer-sharebytes"], size)
-            self.failUnless(rec["actual-diskbytes"] >= size,
+            # different platforms have different notions of "blocks used by
+            # this file", so merely assert that it's a number
+            self.failUnless(rec["actual-diskbytes"] >= 0,
                             rec["actual-diskbytes"])
-            self.failUnless(rec["original-leasetimer-diskbytes"] >= size,
+            self.failUnless(rec["original-leasetimer-diskbytes"] >= 0,
                             rec["original-leasetimer-diskbytes"])
-            self.failUnless(rec["configured-leasetimer-diskbytes"] >= size,
+            self.failUnless(rec["configured-leasetimer-diskbytes"] >= 0,
                             rec["configured-leasetimer-diskbytes"])
         d.addCallback(_after_first_cycle)
         d.addCallback(lambda ign: self.render1(webstatus))