test: fix Throttle unit test.

A bunch of these are slightly racy so they're enclosed in loops. This
particular one, though, changes the Throttle state in ways that
invalidate the asserts. To fix, reset the state before commencing a
rerun.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc
index f50ef2e1b7b98742d5d8274d388724b4cd3664f8..60d7daebdac214c2d9ad07172e804523eb4ce8c8 100644 (file)
--- a/src/test/common/Throttle.cc
+++ b/src/test/common/Throttle.cc
@@ -193,10 +193,13 @@ TEST_F(ThrottleTest, wait) {
 
     t.join();
 
-    if (!(waited = t.waited))
+    if (!(waited = t.waited)) {
       delay *= 2;
+      // undo the changes we made
+      throttle.put(throttle_max / 2);
+      throttle.wait(throttle_max);
+    }
   } while(!waited);
-         
 }
 
 TEST_F(ThrottleTest, destructor) {