Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Side by Side Diff: chromeos/network/network_connection_handler_unittest.cc

Issue 411043002: Disable NetworkConnectionHandlerTest.ConnectWithCertificateRequestedBeforeCertsAreLoaded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/network_connection_handler.h" 5 #include "chromeos/network/network_connection_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate, 364 SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate,
365 certs[0]->subject().common_name.c_str()), 365 certs[0]->subject().common_name.c_str()),
366 base::DictionaryValue(), // no global config 366 base::DictionaryValue(), // no global config
367 true); // load as user policy 367 true); // load as user policy
368 368
369 Connect("wifi4"); 369 Connect("wifi4");
370 EXPECT_EQ(kSuccessResult, GetResultAndReset()); 370 EXPECT_EQ(kSuccessResult, GetResultAndReset());
371 } 371 }
372 372
373 // Disabled, see http://crbug.com/396729.
373 TEST_F(NetworkConnectionHandlerTest, 374 TEST_F(NetworkConnectionHandlerTest,
374 ConnectWithCertificateRequestedBeforeCertsAreLoaded) { 375 DISABLED_ConnectWithCertificateRequestedBeforeCertsAreLoaded) {
375 net::CertificateList certs; 376 net::CertificateList certs;
376 ImportClientCertAndKey("websocket_client_cert.p12", 377 ImportClientCertAndKey("websocket_client_cert.p12",
377 test_nssdb_.get(), 378 test_nssdb_.get(),
378 &certs); 379 &certs);
379 380
380 SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate, 381 SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate,
381 certs[0]->subject().common_name.c_str()), 382 certs[0]->subject().common_name.c_str()),
382 base::DictionaryValue(), // no global config 383 base::DictionaryValue(), // no global config
383 true); // load as user policy 384 true); // load as user policy
384 385
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 true); 492 true);
492 493
493 SetupPolicy(kPolicy, global_config, false /* load as device policy */); 494 SetupPolicy(kPolicy, global_config, false /* load as device policy */);
494 EXPECT_EQ(shill::kStateIdle, 495 EXPECT_EQ(shill::kStateIdle,
495 GetServiceStringProperty("wifi0", shill::kStateProperty)); 496 GetServiceStringProperty("wifi0", shill::kStateProperty));
496 EXPECT_EQ(shill::kStateOnline, 497 EXPECT_EQ(shill::kStateOnline,
497 GetServiceStringProperty("wifi1", shill::kStateProperty)); 498 GetServiceStringProperty("wifi1", shill::kStateProperty));
498 } 499 }
499 500
500 } // namespace chromeos 501 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698