Commit 4b413cbc authored by Collin Baker's avatar Collin Baker Committed by Commit Bot

Disable timing out payments tests on Mac

TBR=rouslan@chromium.org

Bug: 1129573, 1129578
Change-Id: Ic6b7132065fb5cdca9309803ec1a6c628ae5775b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417289
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Auto-Submit: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808066}
parent 60924561
......@@ -15,8 +15,17 @@ namespace {
class AbortPaymentHandlerTest : public PaymentRequestPlatformBrowserTestBase {};
// TODO(crbug.com/1129578): fix flakiness and reenable
#if defined(OS_MAC)
#define MAYBE_CanAbortInvokedInstalledPaymentHandler \
DISABLED_CanAbortInvokedInstalledPaymentHandler
#else
#define MAYBE_CanAbortInvokedInstalledPaymentHandler \
CanAbortInvokedInstalledPaymentHandler
#endif
IN_PROC_BROWSER_TEST_F(AbortPaymentHandlerTest,
CanAbortInvokedInstalledPaymentHandler) {
MAYBE_CanAbortInvokedInstalledPaymentHandler) {
std::string method_name = https_server()->GetURL("a.com", "/").spec();
method_name = method_name.substr(0, method_name.length() - 1);
ASSERT_NE('/', method_name[method_name.length() - 1]);
......
......@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "build/build_config.h"
#include "chrome/test/payments/payment_request_platform_browsertest_base.h"
#include "content/public/test/browser_test.h"
#include "content/public/test/browser_test_utils.h"
......@@ -10,7 +11,16 @@
namespace payments {
namespace {
class LoadAndRemoveIframeWithManyPaymentRequestsTest
// TODO(crbug.com/1129573): fix flakiness and reenable
#if defined(OS_MAC)
#define MAYBE_LoadAndRemoveIframeWithManyPaymentRequestsTest \
DISABLED_LoadAndRemoveIframeWithManyPaymentRequestsTest
#else
#define MAYBE_LoadAndRemoveIframeWithManyPaymentRequestsTest \
LoadAndRemoveIframeWithManyPaymentRequestsTest
#endif
class MAYBE_LoadAndRemoveIframeWithManyPaymentRequestsTest
: public PaymentRequestPlatformBrowserTestBase {
public:
void RunTest(const std::string& iframe_hostname) {
......@@ -28,12 +38,12 @@ class LoadAndRemoveIframeWithManyPaymentRequestsTest
}
};
IN_PROC_BROWSER_TEST_F(LoadAndRemoveIframeWithManyPaymentRequestsTest,
IN_PROC_BROWSER_TEST_F(MAYBE_LoadAndRemoveIframeWithManyPaymentRequestsTest,
CrossOriginNoCrash) {
RunTest(/*iframe_hostname=*/"b.com");
}
IN_PROC_BROWSER_TEST_F(LoadAndRemoveIframeWithManyPaymentRequestsTest,
IN_PROC_BROWSER_TEST_F(MAYBE_LoadAndRemoveIframeWithManyPaymentRequestsTest,
SameOriginNoCrash) {
RunTest(/*iframe_hostname=*/"a.com");
}
......
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