Using fake clock for TURN port tests and un-disabling some tests.

webrtc/base/gunit.h

Index: webrtc/base/gunit.h
diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
index ad52a43c824d3cf705edd51bd7bd7cf669d7ef98..b087badd94ab5cbd64803db680b4026fcdbec444 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);) { \

[Taylor Brandstetter, 2016/06/24 16:33:40]

I'm adding parentheses around "timeout" because this macro was breaking if I
tried to pass anything funky as the timeout argument. Such as a ternary
expression; it compiled fine but resulted in an endless loop due to operator
precedence and such. "time < start + condition ? timeout_a : timeout_b" equates
to "(bool)((time < start + condition) ? timeout_a : timeout_b)"

+    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_