commit 2ebfb3805569608330c609e632e0dcfb426273f7
author Nick Maniscalco <maniscalco@google.com> Thu May 16 23:08:22 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu May 16 23:08:22 2019 +0000
tree 6a8e2bc9461f8d7f9008d67eae40d872985196a7
parent 85fa059fb646dc072179372774f4631efb141d9d

[modular][testing] Remove timeouts from last_focus_time_test

LastFocusTimeTest.LastFocusTimeIncreases appears to sometimes exceed
its 5 second timeout.

Removing individual timeouts and relying on test infrastructure
provide timeout instead.

Bug: MF-416 #done
Change-Id: Ie00233e55069cacf5abfd346c27a7f16a9612db0

src/modular/tests/last_focus_time_test.cc

diff --git a/src/modular/tests/last_focus_time_test.cc b/src/modular/tests/last_focus_time_test.cc
index 226d1b5..5d4c0cc 100644
--- a/src/modular/tests/last_focus_time_test.cc
+++ b/src/modular/tests/last_focus_time_test.cc
@@ -204,8 +204,7 @@
   test_harness()->Run(std::move(spec));
 
   // Wait for our session shell to start.
-  ASSERT_TRUE(RunLoopWithTimeoutOrUntil([&] { return !!test_session_shell; },
-                                        zx::sec(5)));
+  RunLoopUntil([&] { return !!test_session_shell; });
 
   // Connect to extra services also provided to session shells.
   fuchsia::modular::PuppetMasterPtr puppet_master;
@@ -247,8 +246,7 @@
   bool story_created{false};
   story_puppet_master->Execute(
       [&](fuchsia::modular::ExecuteResult result) { story_created = true; });
-  ASSERT_TRUE(
-      RunLoopWithTimeoutOrUntil([&] { return story_created; }, zx::sec(5)));
+  RunLoopUntil([&] { return story_created; });
 
   // Watch the story and then start it.
   TestStoryWatcher story_watcher;
@@ -268,8 +266,7 @@
   // 1) The story is created.
   // 2) The story transitions to running.
   // 3) The story is focused.
-  ASSERT_TRUE(RunLoopWithTimeoutOrUntil(
-      [&]() { return last_focus_timestamps.size() == 3; }, zx::sec(5)));
+  RunLoopUntil([&]() { return last_focus_timestamps.size() == 3; });
   EXPECT_EQ(0, last_focus_timestamps[0]);
   EXPECT_EQ(0, last_focus_timestamps[1]);
   EXPECT_LT(0, last_focus_timestamps[2]);