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>

connection_unittest.cc

diff --git a/connection_unittest.cc b/connection_unittest.cc
index ec9807a..16e0f78 100644
--- a/connection_unittest.cc
+++ b/connection_unittest.cc
@@ -117,6 +117,18 @@
       ipconfig_->properties().dns_servers,
       ipconfig_->properties().domain_search));
 
+  scoped_refptr<MockDevice> device(new StrictMock<MockDevice>(
+      &control_,
+      reinterpret_cast<EventDispatcher *>(NULL),
+      reinterpret_cast<Metrics *>(NULL),
+      reinterpret_cast<Manager *>(NULL),
+      kTestDeviceName0,
+      string(),
+      kTestDeviceInterfaceIndex0));
+  EXPECT_CALL(*device_info_, GetDevice(kTestDeviceInterfaceIndex0))
+      .WillOnce(Return(device));
+  EXPECT_CALL(*device.get(), RequestPortalDetection())
+      .WillOnce(Return(true));
   connection_->SetIsDefault(true);
   EXPECT_TRUE(connection_->is_default());
 
@@ -133,6 +145,18 @@
                                                Connection::kDefaultMetric));
   vector<string> empty_list;
   EXPECT_CALL(resolver_, SetDNSFromLists(empty_list, empty_list));
+  scoped_refptr<MockDevice> device(new StrictMock<MockDevice>(
+      &control_,
+      reinterpret_cast<EventDispatcher *>(NULL),
+      reinterpret_cast<Metrics *>(NULL),
+      reinterpret_cast<Manager *>(NULL),
+      kTestDeviceName0,
+      string(),
+      kTestDeviceInterfaceIndex0));
+  EXPECT_CALL(*device_info_, GetDevice(kTestDeviceInterfaceIndex0))
+      .WillOnce(Return(device));
+  EXPECT_CALL(*device.get(), RequestPortalDetection())
+      .WillOnce(Return(true));
   connection_->SetIsDefault(true);
 
   EXPECT_CALL(rtnl_handler_,