Using fake clock for TURN port tests and un-disabling some tests.
The fake clock has a few advantages:
1. It lets use verify that operations take the expected number of
round trips.
2. It makes the tests faster by letting us remove the equivalent
of "Sleep(500)" all over the tests.
3. It makes the tests less flaky, because sometimes sleeping for
500ms or waiting for 1s is not enough.
R=honghaiz@webrtc.org, pthatcher@webrtc.org
Review URL: https://codereview.webrtc.org/2097793003 .
Cr-Commit-Position: refs/heads/master@{#13304}
diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
index ad52a43..b087bad 100644
--- a/webrtc/base/gunit.h
+++ b/webrtc/base/gunit.h
@@ -21,25 +21,25 @@
#endif
// Wait until "ex" is true, or "timeout" expires.
-#define WAIT(ex, timeout) \
- for (int64_t start = rtc::SystemTimeMillis(); \
- !(ex) && rtc::SystemTimeMillis() < start + timeout;) { \
- rtc::Thread::Current()->ProcessMessages(0); \
- rtc::Thread::Current()->SleepMs(1); \
+#define WAIT(ex, timeout) \
+ for (int64_t start = rtc::SystemTimeMillis(); \
+ !(ex) && rtc::SystemTimeMillis() < start + (timeout);) { \
+ rtc::Thread::Current()->ProcessMessages(0); \
+ rtc::Thread::Current()->SleepMs(1); \
}
// This returns the result of the test in res, so that we don't re-evaluate
// the expression in the XXXX_WAIT macros below, since that causes problems
// when the expression is only true the first time you check it.
-#define WAIT_(ex, timeout, res) \
- do { \
- int64_t start = rtc::SystemTimeMillis(); \
- res = (ex); \
- while (!res && rtc::SystemTimeMillis() < start + timeout) { \
- rtc::Thread::Current()->ProcessMessages(0); \
- rtc::Thread::Current()->SleepMs(1); \
- res = (ex); \
- } \
+#define WAIT_(ex, timeout, res) \
+ do { \
+ int64_t start = rtc::SystemTimeMillis(); \
+ res = (ex); \
+ while (!res && rtc::SystemTimeMillis() < start + (timeout)) { \
+ rtc::Thread::Current()->ProcessMessages(0); \
+ rtc::Thread::Current()->SleepMs(1); \
+ res = (ex); \
+ } \
} while (0)
// The typical EXPECT_XXXX and ASSERT_XXXXs, but done until true or a timeout.
@@ -74,26 +74,27 @@
// Version with a "soft" timeout and a margin. This logs if the timeout is
// exceeded, but it only fails if the expression still isn't true after the
// margin time passes.
-#define EXPECT_TRUE_WAIT_MARGIN(ex, timeout, margin) \
- do { \
- bool res; \
- WAIT_(ex, timeout, res); \
- if (res) { \
- break; \
- } \
- LOG(LS_WARNING) << "Expression " << #ex << " still not true after " << \
- timeout << "ms; waiting an additional " << margin << "ms"; \
- WAIT_(ex, margin, res); \
- if (!res) { \
- EXPECT_TRUE(ex); \
- } \
+#define EXPECT_TRUE_WAIT_MARGIN(ex, timeout, margin) \
+ do { \
+ bool res; \
+ WAIT_(ex, timeout, res); \
+ if (res) { \
+ break; \
+ } \
+ LOG(LS_WARNING) << "Expression " << #ex << " still not true after " \
+ << (timeout) << "ms; waiting an additional " << margin \
+ << "ms"; \
+ WAIT_(ex, margin, res); \
+ if (!res) { \
+ EXPECT_TRUE(ex); \
+ } \
} while (0)
// Wait until "ex" is true, or "timeout" expires, using fake clock where
// messages are processed every millisecond.
#define SIMULATED_WAIT(ex, timeout, clock) \
for (int64_t start = rtc::TimeMillis(); \
- !(ex) && rtc::TimeMillis() < start + timeout;) { \
+ !(ex) && rtc::TimeMillis() < start + (timeout);) { \
clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(1)); \
}
@@ -104,7 +105,7 @@
do { \
int64_t start = rtc::TimeMillis(); \
res = (ex); \
- while (!res && rtc::TimeMillis() < start + timeout) { \
+ while (!res && rtc::TimeMillis() < start + (timeout)) { \
clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(1)); \
res = (ex); \
} \
@@ -129,4 +130,20 @@
} \
} while (0)
+#define ASSERT_TRUE_SIMULATED_WAIT(ex, timeout, clock) \
+ do { \
+ bool res; \
+ SIMULATED_WAIT_(ex, timeout, res, clock); \
+ if (!res) \
+ ASSERT_TRUE(ex); \
+ } while (0)
+
+#define ASSERT_EQ_SIMULATED_WAIT(v1, v2, timeout, clock) \
+ do { \
+ bool res; \
+ SIMULATED_WAIT_(v1 == v2, timeout, res, clock); \
+ if (!res) \
+ ASSERT_EQ(v1, v2); \
+ } while (0)
+
#endif // WEBRTC_BASE_GUNIT_H_
