diff options
author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 03:02:19 +0000 |
---|---|---|
committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 03:02:19 +0000 |
commit | 45c6f672d6c3a058b5724e68dec1b641c33e3417 (patch) | |
tree | d80caea671bba3940ae0498e28afa5210dd4439c /chrome/browser/printing | |
parent | 897d236ca24e9cd09b8d39ae4c67bf4c27a86bc0 (diff) | |
download | chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.zip chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.tar.gz chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.tar.bz2 |
Another batch of disabled Ash browser tests
Ran the tests locally and disabled all failing tests (still too many timeouts to actually get through all the tests -- browser tests quit after 5+ tiemouts I think...)... will do another pass.
Temporarily disabled tests are tracked @ https://docs.google.com/a/google.com/document/d/110YdKCAj3MxECZcW3iwYLjgTdzs2aZicLeA8OrC20Zo/edit
BUG=179830, 262796
Review URL: https://chromiumcodereview.appspot.com/19786007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
-rw-r--r-- | chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc index 6433df6..eb238e5 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc @@ -14,6 +14,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/common/result_codes.h" +#if defined(OS_WIN) && defined(USE_ASH) +#include "base/win/windows_version.h" +#endif + // These tests don't apply to the Mac version; see GetCommandLineForRelaunch // for details. #if defined(OS_MACOSX) @@ -28,6 +32,12 @@ class CloudPrintPolicyTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, NormalPassedFlag) { +#if defined(OS_WIN) && defined(USE_ASH) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + return; +#endif + base::FilePath test_file_path = ui_test_utils::GetTestFilePath( base::FilePath(), base::FilePath().AppendASCII("empty.html")); CommandLine new_command_line(GetCommandLineForRelaunch()); |