Commit 21ff00fc authored by John Abd-El-Malek's avatar John Abd-El-Malek

Disable CertLoaderTest and NetworkCertMigratorTest tests in debug builds as they time out.

BUG=418369
TBR=zelidrag@chromium.org

Review URL: https://codereview.chromium.org/613553002

Cr-Commit-Position: refs/heads/master@{#297117}
parent a9527ce3
...@@ -172,6 +172,8 @@ class CertLoaderTest : public testing::Test, ...@@ -172,6 +172,8 @@ class CertLoaderTest : public testing::Test,
size_t certificates_loaded_events_count_; size_t certificates_loaded_events_count_;
}; };
// http://crbug.com/418369
#ifndef NDEBUG
TEST_F(CertLoaderTest, Basic) { TEST_F(CertLoaderTest, Basic) {
EXPECT_FALSE(cert_loader_->CertificatesLoading()); EXPECT_FALSE(cert_loader_->CertificatesLoading());
EXPECT_FALSE(cert_loader_->certificates_loaded()); EXPECT_FALSE(cert_loader_->certificates_loaded());
...@@ -313,5 +315,7 @@ TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) { ...@@ -313,5 +315,7 @@ TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) {
EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount()); EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
} }
#endif
} // namespace } // namespace
} // namespace chromeos } // namespace chromeos
...@@ -307,6 +307,8 @@ class NetworkCertMigratorTest : public testing::Test { ...@@ -307,6 +307,8 @@ class NetworkCertMigratorTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(NetworkCertMigratorTest); DISALLOW_COPY_AND_ASSIGN(NetworkCertMigratorTest);
}; };
// http://crbug.com/418369
#ifndef NDEBUG
TEST_F(NetworkCertMigratorTest, MigrateNssOnInitialization) { TEST_F(NetworkCertMigratorTest, MigrateNssOnInitialization) {
// Add a new network for migration before the handlers are initialized. // Add a new network for migration before the handlers are initialized.
SetupWifiWithNss(); SetupWifiWithNss();
...@@ -504,4 +506,6 @@ TEST_F(NetworkCertMigratorTest, MigrateIpsecCertIdWrongSlotId) { ...@@ -504,4 +506,6 @@ TEST_F(NetworkCertMigratorTest, MigrateIpsecCertIdWrongSlotId) {
EXPECT_EQ(test_client_cert_slot_id_, slot_id); EXPECT_EQ(test_client_cert_slot_id_, slot_id);
} }
#endif
} // namespace chromeos } // namespace chromeos
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment