commit a0e645ef4df5ed16fef367ec97c3d9cded7980ee
author Darin Petkov <petkov@chromium.org> Wed Apr 25 11:38:59 2012 +0200
committer Gerrit <chrome-bot@google.com> Wed Apr 25 14:54:12 2012 -0700
tree d27042c1cef27728e71d3afd65d7118b28d150d1
parent 10241e32c136ba99e7533ca1370e2e8eca241b7c

shill: vpn: Disconnect L2TP/IPSec properly.

Also, add some missing unit tests.

BUG=chromium-os:29364
TEST=unit tests

Change-Id: I2292fb14a27e0fd5f29c42f5dc58c6b1bdeab9c6
Reviewed-on: https://gerrit.chromium.org/gerrit/21042
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

l2tp_ipsec_driver_unittest.cc

diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 52d1bf2..a1ccb1b 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -144,7 +144,10 @@
   const int kPID = 123456;
   driver_->pid_ = kPID;
   EXPECT_CALL(glib_, SpawnClosePID(kPID));
+  driver_->device_ = device_;
   driver_->service_ = service_;
+  EXPECT_CALL(*device_, OnDisconnected());
+  EXPECT_CALL(*device_, SetEnabled(false));
   EXPECT_CALL(*service_, SetState(Service::kStateFailure));
   driver_->rpc_task_.reset(new RPCTask(&control_, this));
   FilePath psk_file = SetupPSKFile();
@@ -154,6 +157,7 @@
   EXPECT_EQ(0, driver_->child_watch_tag_);
   EXPECT_EQ(0, driver_->pid_);
   EXPECT_FALSE(driver_->rpc_task_.get());
+  EXPECT_FALSE(driver_->device_);
   EXPECT_FALSE(driver_->service_);
 }
 
@@ -399,6 +403,17 @@
   EXPECT_TRUE(error.IsSuccess());
 }
 
+TEST_F(L2TPIPSecDriverTest, Disconnect) {
+  driver_->device_ = device_;
+  driver_->service_ = service_;
+  EXPECT_CALL(*device_, OnDisconnected());
+  EXPECT_CALL(*device_, SetEnabled(false));
+  EXPECT_CALL(*service_, SetState(Service::kStateIdle));
+  driver_->Disconnect();
+  EXPECT_FALSE(driver_->device_);
+  EXPECT_FALSE(driver_->service_);
+}
+
 TEST_F(L2TPIPSecDriverTest, InitPropertyStore) {
   // Sanity test property store initialization.
   PropertyStore store;
@@ -457,4 +472,31 @@
   EXPECT_TRUE(driver_->psk_file_.empty());
 }
 
+TEST_F(L2TPIPSecDriverTest, NotifyFail) {
+  map<string, string> dict;
+  driver_->device_ = device_;
+  EXPECT_CALL(*device_, OnDisconnected());
+  driver_->Notify("fail", dict);
+}
+
+TEST_F(L2TPIPSecDriverTest, VerifyPaths) {
+  // Ensure that the various path constants that the L2TP/IPSec driver uses
+  // actually exists in the build image.  Due to build dependencies, they should
+  // already exist by the time we run unit tests.
+
+  // The L2TPIPSecDriver path constants are absolute.  FilePath::Append asserts
+  // that its argument is not an absolute path, so we need to strip the leading
+  // separators.  There's nothing built into FilePath to do so.
+  static const char *kPaths[] = {
+    L2TPIPSecDriver::kL2TPIPSecVPNPath,
+    L2TPIPSecDriver::kPPPDPlugin,
+  };
+  for (size_t i = 0; i < arraysize(kPaths); i++) {
+    string path(kPaths[i]);
+    TrimString(path, FilePath::kSeparators, &path);
+    EXPECT_TRUE(file_util::PathExists(FilePath(SYSROOT).Append(path)))
+        << kPaths[i];
+  }
+}
+
 }  // namespace shill