Merge pull request #504 from TousakaRin/circuit_breaker

Fix bug: Unit test for circuit_breaker occasionally fails

Merge pull request #504 from TousakaRin/circuit_breaker
Fix bug: Unit test for circuit_breaker occasionally fails
79dcf456 · Ge Jun · GitHub · 4f545e79 · bd572c58 · 79dcf456
Unverified Commit 79dcf456 authored Sep 20, 2018 by Ge Jun Committed by GitHub Sep 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

brpc_circuit_breaker_unittest.cpp test/brpc_circuit_breaker_unittest.cpp +1 -1

No files found.
--- a/test/brpc_circuit_breaker_unittest.cpp
+++ b/test/brpc_circuit_breaker_unittest.cpp
@@ -173,7 +173,7 @@ TEST_F(CircuitBreakerTest, isolation_duration_grow) {
    EXPECT_EQ(_circuit_breaker.isolation_duration_ms(), kMinIsolationDurationMs * 4);

    _circuit_breaker.Reset();
-    bthread_usleep(kMaxIsolationDurationMs * 1000);
+    bthread_usleep((kMaxIsolationDurationMs + kMinIsolationDurationMs) * 1000);
    StartFeedbackThread(&thread_list, &fc_list, 100);
    for (int  i = 0; i < kThreadNum; ++i) {
        void* ret_data = NULL;