Commit 6f8aac82 authored by iclelland's avatar iclelland Committed by Commit bot

Disable flaky origin trial tests on Android

Several tests are flaking on Android swarming bots as they rely on the
system time being correct. Disabling them until we can remove the
dependency on the system clock.

BUG=672294,672843
TBR=asargent@chromium.org

Review-Url: https://codereview.chromium.org/2564873002
Cr-Commit-Position: refs/heads/master@{#437553}
parent a5173075
...@@ -185,7 +185,13 @@ class TrialTokenValidatorTest : public testing::Test { ...@@ -185,7 +185,13 @@ class TrialTokenValidatorTest : public testing::Test {
TestContentClient test_content_client_; TestContentClient test_content_client_;
}; };
TEST_F(TrialTokenValidatorTest, ValidateValidToken) { // Flaky on Android swarming bots: crbug.com/672294
#if defined(OS_ANDROID)
#define MAYBE_ValidateValidToken DISABLED_ValidateValidToken
#else
#define MAYBE_ValidateValidToken ValidateValidToken
#endif
TEST_F(TrialTokenValidatorTest, MAYBE_ValidateValidToken) {
std::string feature; std::string feature;
EXPECT_EQ(blink::WebOriginTrialTokenStatus::Success, EXPECT_EQ(blink::WebOriginTrialTokenStatus::Success,
TrialTokenValidator::ValidateToken(kSampleToken, TrialTokenValidator::ValidateToken(kSampleToken,
...@@ -232,7 +238,13 @@ TEST_F(TrialTokenValidatorTest, ValidateValidTokenWithIncorrectKey) { ...@@ -232,7 +238,13 @@ TEST_F(TrialTokenValidatorTest, ValidateValidTokenWithIncorrectKey) {
appropriate_origin_, &feature)); appropriate_origin_, &feature));
} }
TEST_F(TrialTokenValidatorTest, ValidatorRespectsDisabledFeatures) { // Flaky on Android swarming bots: crbug.com/672294
#if defined(OS_ANDROID)
#define MAYBE_ValidatorRespectsDisabledFeatures DISABLED_ValidatorRespectsDisabledFeatures
#else
#define MAYBE_ValidatorRespectsDisabledFeatures ValidatorRespectsDisabledFeatures
#endif
TEST_F(TrialTokenValidatorTest, MAYBE_ValidatorRespectsDisabledFeatures) {
std::string feature; std::string feature;
// Disable an irrelevant feature; token should still validate // Disable an irrelevant feature; token should still validate
DisableFeature(kInappropriateFeatureName); DisableFeature(kInappropriateFeatureName);
...@@ -254,7 +266,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestInsecure) { ...@@ -254,7 +266,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestInsecure) {
GURL(kInsecureOrigin), response_headers_.get(), kAppropriateFeatureName)); GURL(kInsecureOrigin), response_headers_.get(), kAppropriateFeatureName));
} }
TEST_F(TrialTokenValidatorTest, ValidateRequestValidToken) { // Flaky on Android swarming bots: crbug.com/672294
#if defined(OS_ANDROID)
#define MAYBE_ValidateRequestValidToken DISABLED_ValidateRequestValidToken
#else
#define MAYBE_ValidateRequestValidToken ValidateRequestValidToken
#endif
TEST_F(TrialTokenValidatorTest, MAYBE_ValidateRequestValidToken) {
response_headers_->AddHeader(std::string("Origin-Trial: ") + kSampleToken); response_headers_->AddHeader(std::string("Origin-Trial: ") + kSampleToken);
EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature( EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature(
GURL(kAppropriateOrigin), response_headers_.get(), GURL(kAppropriateOrigin), response_headers_.get(),
...@@ -267,7 +285,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestNoTokens) { ...@@ -267,7 +285,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestNoTokens) {
kAppropriateFeatureName)); kAppropriateFeatureName));
} }
TEST_F(TrialTokenValidatorTest, ValidateRequestMultipleHeaders) { // Flaky on Android swarming bots: crbug.com/672294
#if defined(OS_ANDROID)
#define MAYBE_ValidateRequestMultipleHeaders DISABLED_ValidateRequestMultipleHeaders
#else
#define MAYBE_ValidateRequestMultipleHeaders ValidateRequestMultipleHeaders
#endif
TEST_F(TrialTokenValidatorTest, MAYBE_ValidateRequestMultipleHeaders) {
response_headers_->AddHeader(std::string("Origin-Trial: ") + kSampleToken); response_headers_->AddHeader(std::string("Origin-Trial: ") + kSampleToken);
response_headers_->AddHeader(std::string("Origin-Trial: ") + kExpiredToken); response_headers_->AddHeader(std::string("Origin-Trial: ") + kExpiredToken);
EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature( EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature(
...@@ -281,7 +305,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestMultipleHeaders) { ...@@ -281,7 +305,13 @@ TEST_F(TrialTokenValidatorTest, ValidateRequestMultipleHeaders) {
kAppropriateFeatureName)); kAppropriateFeatureName));
} }
TEST_F(TrialTokenValidatorTest, ValidateRequestMultipleHeaderValues) { // Flaky on Android swarming bots: crbug.com/672294
#if defined(OS_ANDROID)
#define MAYBE_ValidateRequestMultipleHeaderValues DISABLED_ValidateRequestMultipleHeaderValues
#else
#define MAYBE_ValidateRequestMultipleHeaderValues ValidateRequestMultipleHeaderValues
#endif
TEST_F(TrialTokenValidatorTest, MAYBE_ValidateRequestMultipleHeaderValues) {
response_headers_->AddHeader(std::string("Origin-Trial: ") + kExpiredToken + response_headers_->AddHeader(std::string("Origin-Trial: ") + kExpiredToken +
", " + kSampleToken); ", " + kSampleToken);
EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature( EXPECT_TRUE(TrialTokenValidator::RequestEnablesFeature(
......
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