commit 21f7b34c81559574ea6c8ce7c1fd62423d07f566
author Paul Stewart <pstew@chromium.org> Tue Nov 19 10:15:58 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Nov 19 21:23:13 2013 +0000
tree d239916fe7b4e34fa4d9f6759865280c27e7ae99
parent c6fbad96f565fda1caae9cd80569314685c99b90

shill: DHCPConfig: Get new lease with RenewIP

If a DHCP process is not running when RenewIP is called, acquire
a new lease instead of returning.  This allows callers external
to shill to avoid having to keep track of whether the IPConfig
object has a lease or not.

BUG=chromium:318290
TEST=Unit test + manual: Reproduce the issue in crbug.com/318290.
In specific, change the IP address to a static IP first and close
the configuration panel, then separately switch to custom name
servers.

Change-Id: Ifebf7507f65dc981e5ca77d000ba298e0c6f22ee
Reviewed-on: https://chromium-review.googlesource.com/177350
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

dhcp_config.cc

diff --git a/dhcp_config.cc b/dhcp_config.cc
index 0c11115..05ffd33 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -114,7 +114,7 @@
 bool DHCPConfig::RenewIP() {
   SLOG(DHCP, 2) << __func__ << ": " << device_name();
   if (!pid_) {
-    return false;
+    return Start();
   }
   if (!proxy_.get()) {
     LOG(ERROR) << "Unable to renew IP before acquiring destination.";

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 312530d..88adfd2 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -31,6 +31,7 @@
 using testing::_;
 using testing::AnyNumber;
 using testing::ContainsRegex;
+using testing::Mock;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::Test;
@@ -604,6 +605,11 @@
 }
 
 TEST_F(DHCPConfigTest, RenewIP) {
+  EXPECT_CALL(*minijail_, RunAndDestroy(_, _, _)).WillOnce(Return(false));
+  config_->pid_ = 0;
+  EXPECT_FALSE(config_->RenewIP());  // Expect a call to Start() if pid_ is 0.
+  Mock::VerifyAndClearExpectations(minijail_.get());
+  EXPECT_CALL(*minijail_, RunAndDestroy(_, _, _)).Times(0);
   EXPECT_TRUE(config_->lease_acquisition_timeout_callback_.IsCancelled());
   config_->pid_ = 456;
   EXPECT_FALSE(config_->RenewIP());  // Expect no crash with NULL proxy.

mock_dhcp_config.h

diff --git a/mock_dhcp_config.h b/mock_dhcp_config.h
index c7de64c..1ce2820 100644
--- a/mock_dhcp_config.h
+++ b/mock_dhcp_config.h
@@ -22,6 +22,7 @@
 
   MOCK_METHOD0(RequestIP, bool());
   MOCK_METHOD1(ReleaseIP, bool(ReleaseReason));
+  MOCK_METHOD0(RenewIP, bool());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDHCPConfig);