Commit 3f065f43 authored by guidou's avatar guidou Committed by Commit bot

Disable tests failing on Win Tester bot.

SyncSetupWebUITestAsync.RestoreSyncDataTypes
SearchEngineManagerWebUITest.testOpenSearchEngineManager

TBR=dbeam@chromium.org
BUG=638884

Review-Url: https://codereview.chromium.org/2247033007
Cr-Commit-Position: refs/heads/master@{#412803}
parent 5beec71d
...@@ -20,12 +20,13 @@ SearchEngineManagerWebUITest.prototype = { ...@@ -20,12 +20,13 @@ SearchEngineManagerWebUITest.prototype = {
// See crosbug.com/22673 for OS_CHROMEOS // See crosbug.com/22673 for OS_CHROMEOS
// See crbug.com/579666 for OS_LINUX // See crbug.com/579666 for OS_LINUX
GEN('#if defined(OS_CHROMEOS) || defined(OS_LINUX)'); // See crbug.com/638884 for OS_WIN
GEN('#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)');
GEN('#define MAYBE_testOpenSearchEngineManager ' + GEN('#define MAYBE_testOpenSearchEngineManager ' +
'DISABLED_testOpenSearchEngineManager'); 'DISABLED_testOpenSearchEngineManager');
GEN('#else'); GEN('#else');
GEN('#define MAYBE_testOpenSearchEngineManager testOpenSearchEngineManager'); GEN('#define MAYBE_testOpenSearchEngineManager testOpenSearchEngineManager');
GEN('#endif // defined(OS_CHROMEOS) || defined(OS_LINUX)'); GEN('#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)');
// Test opening the search engine manager has correct location. // Test opening the search engine manager has correct location.
TEST_F('SearchEngineManagerWebUITest', 'MAYBE_testOpenSearchEngineManager', TEST_F('SearchEngineManagerWebUITest', 'MAYBE_testOpenSearchEngineManager',
......
...@@ -108,12 +108,13 @@ TEST_F('SyncSetupWebUITestAsync', 'MAYBE_VerifySignIn', function() { ...@@ -108,12 +108,13 @@ TEST_F('SyncSetupWebUITestAsync', 'MAYBE_VerifySignIn', function() {
this.startSyncing(); this.startSyncing();
}); });
// This test is flaky on Linux bot. See crbug.com/579666 // This test is flaky on Linux and Windows bots. See crbug.com/579666 and
GEN('#if defined(OS_LINUX)'); // crbug.com/638884
GEN('#if defined(OS_LINUX) || defined(OS_WIN)');
GEN('#define MAYBE_RestoreSyncDataTypes DISABLED_RestoreSyncDataTypes'); GEN('#define MAYBE_RestoreSyncDataTypes DISABLED_RestoreSyncDataTypes');
GEN('#else'); GEN('#else');
GEN('#define MAYBE_RestoreSyncDataTypes RestoreSyncDataTypes'); GEN('#define MAYBE_RestoreSyncDataTypes RestoreSyncDataTypes');
GEN('#endif // defined(OS_LINUX)'); GEN('#endif // defined(OS_LINUX) || defined(OS_WIN)');
// Test that switching to and from "Sync everything" saves and restores types. // Test that switching to and from "Sync everything" saves and restores types.
TEST_F('SyncSetupWebUITestAsync', 'MAYBE_RestoreSyncDataTypes', function() { TEST_F('SyncSetupWebUITestAsync', 'MAYBE_RestoreSyncDataTypes', function() {
this.mockHandler.expects(once()).SyncSetupStartSignIn( this.mockHandler.expects(once()).SyncSetupStartSignIn(
......
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