Commit 5f40f9c3 authored by Varun Khaneja's avatar Varun Khaneja Committed by Commit Bot

Disable flaky PVer3 tests since PVer3 is no longer used

Bug: 784182
Change-Id: If7935838a2b0bb296f943e8498039de12e6c585f
Reviewed-on: https://chromium-review.googlesource.com/775905
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Reviewed-by: default avatarYuzhu Shen <yzshen@chromium.org>
Reviewed-by: default avatarNathan Parker <nparker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517279}
parent c2dd0c43
......@@ -108,9 +108,11 @@ namespace safe_browsing {
namespace {
#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_FLAKY_PVER3_TESTS)
const char kBlacklistResource[] = "/blacklisted/script.js";
const char kEmptyPage[] = "/empty.html";
const char kMaliciousResource[] = "/malware/script.js";
#endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_FLAKY_PVER3_TESTS)
const char kEmptyPage[] = "/empty.html";
const char kMalwareFile[] = "/downloads/dangerous/dangerous.exe";
const char kMalwarePage[] = "/safe_browsing/malware.html";
const char kMalwareDelayedLoadsPage[] =
......@@ -755,6 +757,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceTest);
};
#if defined(ENABLE_FLAKY_PVER3_TESTS)
class SafeBrowsingServiceMetadataTest
: public SafeBrowsingServiceTest,
public ::testing::WithParamInterface<ThreatPatternType> {
......@@ -1169,6 +1172,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SubResourceHitOnFreshTab) {
content::WaitForInterstitialDetach(new_tab_contents);
EXPECT_FALSE(ShowingInterstitialPage());
}
#endif // defined(ENABLE_FLAKY_PVER3_TESTS)
namespace {
......@@ -1285,6 +1289,7 @@ class TestSBClient : public base::RefCountedThreadSafe<TestSBClient>,
} // namespace
#if defined(ENABLE_FLAKY_PVER3_TESTS)
// These tests use SafeBrowsingService::Client to directly interact with
// SafeBrowsingService.
IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckDownloadUrl) {
......@@ -1652,6 +1657,7 @@ INSTANTIATE_TEST_CASE_P(
/* no prefix */,
SafeBrowsingServiceWebSocketSafeTest,
::testing::Values("window", "worker", "shared-worker", "service-worker"));
#endif // defined(ENABLE_FLAKY_PVER3_TESTS)
class SafeBrowsingServiceShutdownTest : public SafeBrowsingServiceTest {
public:
......
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