ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-22 08:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_storage.py: potential fix for failures when logging is enabled.

Browse Source
This commit is contained in:
david-sarah
1970-07-12 21:05:46 -07:00
parent d0381e679e
commit 3b1b0147a8
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/logging.txt
View File

@ -231,9 +231,6 @@ but a few notes are worth stating here:
== Log Messages During Unit Tests == == Log Messages During Unit Tests ==
*** WARNING: setting the environment variables below may cause some tests to ***
*** fail spuriously. See ticket #923 for the status of a fix for this problem. ***
If a test is failing and you aren't sure why, start by enabling If a test is failing and you aren't sure why, start by enabling
FLOGTOTWISTED=1 like this: FLOGTOTWISTED=1 like this:

35
src/allmydata/test/test_storage.py
View File

@ -1409,6 +1409,10 @@ class BucketCounter(unittest.TestCase, pollmixin.PollMixin):
def _check(ignored): def _check(ignored):
# are we really right after the first prefix? # are we really right after the first prefix?
state = ss.bucket_counter.get_state() state = ss.bucket_counter.get_state()
if state["last-complete-prefix"] is None:
d2 = fireEventually()
d2.addCallback(_check)
return d2
self.failUnlessEqual(state["last-complete-prefix"], self.failUnlessEqual(state["last-complete-prefix"],
ss.bucket_counter.prefixes[0]) ss.bucket_counter.prefixes[0])
ss.bucket_counter.cpu_slice = 100.0 # finish as fast as possible ss.bucket_counter.cpu_slice = 100.0 # finish as fast as possible
@ -1445,10 +1449,14 @@ class BucketCounter(unittest.TestCase, pollmixin.PollMixin):
d = fireEventually() d = fireEventually()
def _after_first_prefix(ignored): def _after_first_prefix(ignored):
state = ss.bucket_counter.state
if state["last-complete-prefix"] is None:
d2 = fireEventually()
d2.addCallback(_after_first_prefix)
return d2
ss.bucket_counter.cpu_slice = 100.0 # finish as fast as possible ss.bucket_counter.cpu_slice = 100.0 # finish as fast as possible
# now sneak in and mess with its state, to make sure it cleans up # now sneak in and mess with its state, to make sure it cleans up
# properly at the end of the cycle # properly at the end of the cycle
state = ss.bucket_counter.state
self.failUnlessEqual(state["last-complete-prefix"], self.failUnlessEqual(state["last-complete-prefix"],
ss.bucket_counter.prefixes[0]) ss.bucket_counter.prefixes[0])
state["bucket-counts"][-12] = {} state["bucket-counts"][-12] = {}
@ -1633,6 +1641,10 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# processed. # processed.
def _after_first_bucket(ignored): def _after_first_bucket(ignored):
initial_state = lc.get_state() initial_state = lc.get_state()
if "cycle-to-date" not in initial_state:
d2 = fireEventually()
d2.addCallback(_after_first_bucket)
return d2
self.failUnlessIn("cycle-to-date", initial_state) self.failUnlessIn("cycle-to-date", initial_state)
self.failUnlessIn("estimated-remaining-cycle", initial_state) self.failUnlessIn("estimated-remaining-cycle", initial_state)
self.failUnlessIn("estimated-current-cycle", initial_state) self.failUnlessIn("estimated-current-cycle", initial_state)
@ -1833,7 +1845,10 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# examine the state right after the first bucket has been processed # examine the state right after the first bucket has been processed
def _after_first_bucket(ignored): def _after_first_bucket(ignored):
p = lc.get_progress() p = lc.get_progress()
self.failUnless(p["cycle-in-progress"], p) if not p["cycle-in-progress"]:
d2 = fireEventually()
d2.addCallback(_after_first_bucket)
return d2
d.addCallback(_after_first_bucket) d.addCallback(_after_first_bucket)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: self.render1(webstatus))
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
@ -1974,7 +1989,10 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# examine the state right after the first bucket has been processed # examine the state right after the first bucket has been processed
def _after_first_bucket(ignored): def _after_first_bucket(ignored):
p = lc.get_progress() p = lc.get_progress()
self.failUnless(p["cycle-in-progress"], p) if not p["cycle-in-progress"]:
d2 = fireEventually()
d2.addCallback(_after_first_bucket)
return d2
d.addCallback(_after_first_bucket) d.addCallback(_after_first_bucket)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: self.render1(webstatus))
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
@ -2246,6 +2264,10 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# have to interrupt it even earlier, before it's finished the # have to interrupt it even earlier, before it's finished the
# first bucket). # first bucket).
s = lc.get_state() s = lc.get_state()
if "cycle-to-date" not in s:
d2 = fireEventually()
d2.addCallback(_check)
return d2
self.failUnlessIn("cycle-to-date", s) self.failUnlessIn("cycle-to-date", s)
self.failUnlessIn("estimated-remaining-cycle", s) self.failUnlessIn("estimated-remaining-cycle", s)
self.failUnlessIn("estimated-current-cycle", s) self.failUnlessIn("estimated-current-cycle", s)
@ -2362,7 +2384,12 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# now examine the state right after the first bucket has been # now examine the state right after the first bucket has been
# processed. # processed.
def _after_first_bucket(ignored): def _after_first_bucket(ignored):
so_far = lc.get_state()["cycle-to-date"] s = lc.get_state()
if "cycle-to-date" not in s:
d2 = fireEventually()
d2.addCallback(_after_first_bucket)
return d2
so_far = s["cycle-to-date"]
rec = so_far["space-recovered"] rec = so_far["space-recovered"]
self.failUnlessEqual(rec["examined-buckets"], 1) self.failUnlessEqual(rec["examined-buckets"], 1)
self.failUnlessEqual(rec["examined-shares"], 0) self.failUnlessEqual(rec["examined-shares"], 0)