Browse Source

[master] Bumped up timeout values in D2 controller tests.

On the FreeBSD10 system installed on the physical machine with the CPU:
(Intel(R) Core(TM) i7-2700K CPU @ 3.50GHz), Kea compiled with clang 3.3,
it takes slightly more than 2100ms (the previous timeout value) for the
callback to occur. This seems to be specific to this system but on the
other hand we don't test on FreeBSDs a lot, so the problem may be more
common than we think. This was okayed on Jabber.
Marcin Siodelski 11 years ago
parent
commit
a6c7bda20a

+ 1 - 1
src/bin/d2/tests/d2_controller_unittests.cc

@@ -141,7 +141,7 @@ TEST_F(D2ControllerTest, launchNormalShutdown) {
     // by an io_service event and callback.
     time_duration elapsed = stop - start;
     EXPECT_TRUE(elapsed.total_milliseconds() >= 1900 &&
-                elapsed.total_milliseconds() <= 2100);
+                elapsed.total_milliseconds() <= 2200);
 }
 
 /// @brief Configuration update event testing.

+ 2 - 2
src/bin/d2/tests/d2_process_unittests.cc

@@ -573,7 +573,7 @@ TEST_F(D2ProcessTest, normalShutdown) {
     // by an io_service event and callback.
     time_duration elapsed = stop - start;
     EXPECT_TRUE(elapsed.total_milliseconds() >= 1900 &&
-                elapsed.total_milliseconds() <= 2100);
+                elapsed.total_milliseconds() <= 2200);
 }
 
 
@@ -598,7 +598,7 @@ TEST_F(D2ProcessTest, fatalErrorShutdown) {
     // during io callback processing.
     time_duration elapsed = stop - start;
     EXPECT_TRUE(elapsed.total_milliseconds() >= 1900 &&
-                elapsed.total_milliseconds() <= 2100);
+                elapsed.total_milliseconds() <= 2200);
 }
 
 /// @brief Used to permit visual inspection of logs to ensure

+ 2 - 2
src/bin/d2/tests/d_controller_unittests.cc

@@ -202,7 +202,7 @@ TEST_F(DStubControllerTest, launchNormalShutdown) {
     // by an io_service event and callback.
     time_duration elapsed = stop - start;
     EXPECT_TRUE(elapsed.total_milliseconds() >= 1900 &&
-                elapsed.total_milliseconds() <= 2100);
+                elapsed.total_milliseconds() <= 2200);
 }
 
 /// @brief Tests launch with an operational error during application execution.
@@ -233,7 +233,7 @@ TEST_F(DStubControllerTest, launchRuntimeError) {
     // by an io_service event and callback.
     time_duration elapsed = stop - start;
     EXPECT_TRUE(elapsed.total_milliseconds() >= 1900 &&
-                elapsed.total_milliseconds() <= 2100);
+                elapsed.total_milliseconds() <= 2200);
 }
 
 /// @brief Tests launch with a session establishment failure.