[or-cvs] r21492: {torflow} Fix a miscount issue if we desync from the fuzzy threshhold (torflow/trunk/CircuitAnalysis/BuildTimes/CBT-Test)

[Mike Perry]

Author: mikeperry
Date: 2010-01-24 23:16:08 +0000 (Sun, 24 Jan 2010)
New Revision: 21492

Modified:
   torflow/trunk/CircuitAnalysis/BuildTimes/CBT-Test/cbttest.py
Log:

Fix a miscount issue if we desync from the fuzzy threshhold
and not the strict one.



Modified: torflow/trunk/CircuitAnalysis/BuildTimes/CBT-Test/cbttest.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/CBT-Test/cbttest.py	2010-01-24 17:12:10 UTC (rev 21491)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/CBT-Test/cbttest.py	2010-01-24 23:16:08 UTC (rev 21492)
@@ -277,8 +277,13 @@
       self.buildtimeout_fuzzy = None
       self.fuzzy_streak_count = 0
       self.cond.min_circs = 0
+      # Kill strict too...
+      self.buildtimeout_strict = None
+      self.strict_streak_count = 0
+      self.cond.num_circs = 0
       try: os.unlink(output_dir+"/state.min")
       except: pass
+      return
     elif not self.cond.min_circs:
       if (self.fuzzy_streak_count != (bt_event.total_times -
                  self.buildtimeout_fuzzy.total_times)):