commit 005bd347e39f4b6b896bab93a7e1854c71bdd6ff
author Wade Guthrie <wdg@chromium.org> Wed May 02 09:37:07 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon May 07 11:49:09 2012 -0700
tree 4b422b8c4819c08bb591597e16fc07088e6c883c
parent cd0349c9bafcb5c250da25691ada7fcc3752e145

Shill: Shill now rebuffs connecting to service that isn't connectable.

In addtion to rebuffing non-connectable service connections, this
removes nulling-out key_management in UnloadEapCredentials.  Previously,
that method set key_management to an illegal value and this broke
subsequent connection attempts.

BUG=chromium-os:30382
TEST=Autotest 092_ProfileCredentials (not yet checked-in) and, now, unit
tests!

Change-Id: I7c2764938dda18720208f3ddf58b858d5d7e708d
Reviewed-on: https://gerrit.chromium.org/gerrit/21631
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>
Commit-Ready: Wade Guthrie <wdg@chromium.org>

wifi_service_unittest.cc

diff --git a/wifi_service_unittest.cc b/wifi_service_unittest.cc
index b6190dd..389c717 100644
--- a/wifi_service_unittest.cc
+++ b/wifi_service_unittest.cc
@@ -336,6 +336,8 @@
                                                    false);
   EXPECT_CALL(*wifi(),
               ConnectTo(wifi_service.get(), WPASecurityArgs()));
+  Error error;
+  wifi_service->SetPassphrase("0:mumblemumblem", &error);
   wifi_service->Connect(NULL);
 }
 
@@ -352,6 +354,8 @@
                                                    false);
   EXPECT_CALL(*wifi(),
               ConnectTo(wifi_service.get(), WPASecurityArgs()));
+  Error error;
+  wifi_service->SetPassphrase("0:mumblemumblem", &error);
   wifi_service->Connect(NULL);
 }
 
@@ -368,6 +372,8 @@
                                                    false);
   EXPECT_CALL(*wifi(),
               ConnectTo(wifi_service.get(), WPASecurityArgs()));
+  Error error;
+  wifi_service->SetPassphrase("0:mumblemumblem", &error);
   wifi_service->Connect(NULL);
 }
 
@@ -384,6 +390,7 @@
                                                    false);
   Service::EapCredentials eap;
   eap.identity = "identity";
+  eap.password = "mumble";
   wifi_service->set_eap(eap);
   EXPECT_CALL(*wifi(),
               ConnectTo(wifi_service.get(), EAPSecurityArgs()));
@@ -483,6 +490,7 @@
   Service::EapCredentials eap;
   eap.key_management = "IEEE8021X";
   eap.identity = "something";
+  eap.password = "mumble";
   wifi_service->set_eap(eap);
   EXPECT_CALL(*wifi(),
               ConnectTo(wifi_service.get(), DynamicWEPArgs()));