diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 12:52:19 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 12:52:19 +0000 |
commit | 9bf87d41666719e9c6ea23a0bcc72036ff2f0c99 (patch) | |
tree | 80d7823f16f6b90ba9656f480ae4e04c8265ef7e | |
parent | 5799902999726a0f7676f48616fef874cc32375c (diff) | |
download | chromium_src-9bf87d41666719e9c6ea23a0bcc72036ff2f0c99.zip chromium_src-9bf87d41666719e9c6ea23a0bcc72036ff2f0c99.tar.gz chromium_src-9bf87d41666719e9c6ea23a0bcc72036ff2f0c99.tar.bz2 |
Stop running appcache layout tests as browser tests
They're now run in content_shell on the blink bots
R=michaeln@chromium.org,jam@chromium.org
BUG=247459
Review URL: https://chromiumcodereview.appspot.com/16181007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204799 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/browser/appcache/appcache_browsertest.cc | 101 | ||||
-rw-r--r-- | content/content_tests.gypi | 1 |
2 files changed, 0 insertions, 102 deletions
diff --git a/content/browser/appcache/appcache_browsertest.cc b/content/browser/appcache/appcache_browsertest.cc deleted file mode 100644 index 72ad4d0..0000000 --- a/content/browser/appcache/appcache_browsertest.cc +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/test/layout_browsertest.h" - -namespace content { - -class AppCacheLayoutTest : public InProcessBrowserLayoutTest { - public: - AppCacheLayoutTest() : InProcessBrowserLayoutTest( - base::FilePath().AppendASCII("http").AppendASCII("tests"), - base::FilePath().AppendASCII("appcache"), - -1) { - } - - protected: - virtual ~AppCacheLayoutTest() {} -}; - -// Flaky and slow, hence disabled: http://crbug.com/54717 -// The tests that don't depend on PHP should be less flaky. -IN_PROC_BROWSER_TEST_F(AppCacheLayoutTest, DISABLED_NoPHP) { - static const char* kNoPHPTests[] = { - "404-manifest.html", - "404-resource.html", - "cyrillic-uri.html", - "deferred-events-delete-while-raising.html", - "deferred-events.html", - "destroyed-frame.html", - "detached-iframe.html", - "different-origin-manifest.html", - "different-scheme.html", - "empty-manifest.html", - "foreign-iframe-main.html", - "insert-html-element-with-manifest.html", - "insert-html-element-with-manifest-2.html", - "manifest-containing-itself.html", - "manifest-parsing.html", - "manifest-with-empty-file.html", - "progress-counter.html", - "reload.html", - "simple.html", - "top-frame-1.html", - "top-frame-2.html", - "top-frame-3.html", - "top-frame-4.html", - "whitelist-wildcard.html", - "wrong-content-type.html", - "wrong-signature-2.html", - "wrong-signature.html", - "xhr-foreign-resource.html", - }; - - // This test is racey. - // https://bugs.webkit.org/show_bug.cgi?id=49104 - // "foreign-fallback.html" - - for (size_t i = 0; i < arraysize(kNoPHPTests); ++i) - RunHttpLayoutTest(kNoPHPTests[i]); -} - -// Flaky: http://crbug.com/54717 -// Lighty/PHP is not reliable enough on windows. -IN_PROC_BROWSER_TEST_F(AppCacheLayoutTest, DISABLED_PHP) { - static const char* kPHPTests[] = { - "auth.html", - "fallback.html", - "main-resource-hash.html", - "manifest-redirect.html", - "manifest-redirect-2.html", - "navigating-away-while-cache-attempt-in-progress.html", - "non-html.xhtml", - "offline-access.html", - "online-whitelist.html", - "remove-cache.html", - "resource-redirect.html", - "resource-redirect-2.html", - "update-cache.html", - }; - - // This tests loads a data url which calls notifyDone, this just - // doesn't work with the testRunner in this test harness. - // "fail-on-update.html", - - // Flaky for reasons i don't yet see? - // "fail-on-update2.html", - - // TODO(michaeln): investigate these more closely - // "crash-when-navigating-away-then-back.html", - // "credential-url.html", - // "different-https-origin-resource-main.html", - // "idempotent-update.html", not sure this is a valid test - // "local-content.html", - // "max-size.html", we use a different quota scheme - - for (size_t i = 0; i < arraysize(kPHPTests); ++i) - RunHttpLayoutTest(kPHPTests[i]); -} - -} // namespace content diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 20467c7..afb8716 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -752,7 +752,6 @@ 'browser/accessibility/accessibility_win_browsertest.cc', 'browser/accessibility/cross_platform_accessibility_browsertest.cc', 'browser/accessibility/dump_accessibility_tree_browsertest.cc', - 'browser/appcache/appcache_browsertest.cc', 'browser/bookmarklet_browsertest.cc', 'browser/browser_plugin/browser_plugin_host_browsertest.cc', 'browser/browser_plugin/test_browser_plugin_embedder.cc', |