CHROMIUM: tests: increase timeout for modem status update

The timeout for modem status update for plugin tests was 30s. While this
is sufficient under normal conditions, it can lead to flaky timeouts
when unittests run on machines under heavy load. This patch increases
the timeout to 120s, which does not affect the test running under normal
circumstances.

This patch has also been sent upstream. This CL should be reverted when
next updating to upstream.

BUG=chromium:497793
TEST=Run unittests.

Change-Id: Ia6884dbda898345afd36e642b884ac1651285c3f
Reviewed-on: https://chromium-review.googlesource.com/280606
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/plugins/tests/test-fixture.c b/plugins/tests/test-fixture.c
index 1ddddd0..d521702 100644
--- a/plugins/tests/test-fixture.c
+++ b/plugins/tests/test-fixture.c
@@ -15,6 +15,9 @@
 
 #include "test-fixture.h"
 
+/* Generic timeout for property updates. */
+static const guint wait_timeout = 120;
+
 void
 test_fixture_setup (TestFixture *fixture)
 {
@@ -127,7 +130,7 @@
             /* Wait a bit before re-checking. We can do this kind of wait
              * because properties in the manager are updated in another
              * thread */
-            g_assert_cmpuint (wait_time, <=, 20);
+            g_assert_cmpuint (wait_time, <=, wait_timeout);
             wait_time++;
             sleep (1);
         } else
@@ -173,7 +176,7 @@
             /* Wait a bit before re-checking. We can do this kind of wait
              * because properties in the manager are updated in another
              * thread */
-            g_assert_cmpuint (wait_time, <=, 20);
+            g_assert_cmpuint (wait_time, <=, wait_timeout);
             wait_time++;
             sleep (1);
         } else