commit c681fa0742cabc686ccabaf0fdf6ce12dd7046b2
author Paul Stewart <pstew@chromium.org> Fri Mar 02 19:40:04 2012 -0800
committer Gerrit <chrome-bot@google.com> Tue Mar 06 17:36:59 2012 -0800
tree b591134a49b18e078a25850f6a4849007fde631a
parent 81030eaefea1b37aa67c3934d17cd6ded9be569d

shill: portal: Recheck portal state

Introduce a retry interval for automatically retrying portal
checks.  Also provide a Manager API method for immediately
re-checking portal status.

BUG=chromium-os:27335
TEST=New unit tests, tested on real machine, including setting
PortaCheckInterval over DBus, and using Jason's addition to
test-flimflam for 'recheck-portal'.
Change-Id: Idc7def18c6f863859e94f4d4e9f266ab2670679c
Reviewed-on: https://gerrit.chromium.org/gerrit/17367
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

manager_unittest.cc

diff --git a/manager_unittest.cc b/manager_unittest.cc
index 9ce7177..8b4269e 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -1353,4 +1353,19 @@
   dispatcher()->DispatchPendingEvents();
 }
 
+TEST_F(ManagerTest, RecheckPortal) {
+  EXPECT_CALL(*mock_devices_[0].get(), RequestPortalDetection())
+      .WillOnce(Return(false));
+  EXPECT_CALL(*mock_devices_[1].get(), RequestPortalDetection())
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_devices_[2].get(), RequestPortalDetection())
+      .Times(0);
+
+  manager()->RegisterDevice(mock_devices_[0]);
+  manager()->RegisterDevice(mock_devices_[1]);
+  manager()->RegisterDevice(mock_devices_[2]);
+
+  manager()->RecheckPortal(NULL);
+}
+
 }  // namespace shill