Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(765)

Side by Side Diff: chrome/browser/ui/webui/sync_setup_browsertest.js

Issue 1945113002: Revert of Disable flaky SyncSetupWebUITestAsync.VerifySignIn test on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 GEN('#if !defined(OS_CHROMEOS)'); 5 GEN('#if !defined(OS_CHROMEOS)');
6 6
7 /** 7 /**
8 * Test fixture for sync setup WebUI testing. 8 * Test fixture for sync setup WebUI testing.
9 * @constructor 9 * @constructor
10 * @extends {testing.Test} 10 * @extends {testing.Test}
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 this.verifyUnsynced(); 74 this.verifyUnsynced();
75 75
76 // Handle SyncSetupShowSetupUI by navigating to chrome://settings/syncSetup. 76 // Handle SyncSetupShowSetupUI by navigating to chrome://settings/syncSetup.
77 this.mockHandler.expects(once()).SyncSetupShowSetupUI().will(callFunction( 77 this.mockHandler.expects(once()).SyncSetupShowSetupUI().will(callFunction(
78 function() { 78 function() {
79 PageManager.showPageByName('syncSetup'); 79 PageManager.showPageByName('syncSetup');
80 })); 80 }));
81 }, 81 },
82 }; 82 };
83 83
84 // This test is flaky on Linux bot (crbug.com/579666) and Windows bot 84 // This test is flaky on Linux bot. See crbug.com/579666
85 // (crbug.com/608975). 85 GEN('#if defined(OS_LINUX)');
86 GEN('#if defined(OS_LINUX) || defined(OS_WIN)');
87 GEN('#define MAYBE_VerifySignIn DISABLED_VerifySignIn'); 86 GEN('#define MAYBE_VerifySignIn DISABLED_VerifySignIn');
88 GEN('#else'); 87 GEN('#else');
89 GEN('#define MAYBE_VerifySignIn VerifySignIn'); 88 GEN('#define MAYBE_VerifySignIn VerifySignIn');
90 GEN('#endif // defined(OS_LINUX) || defined(OS_WIN)'); 89 GEN('#endif // defined(OS_LINUX)');
91 TEST_F('SyncSetupWebUITestAsync', 'MAYBE_VerifySignIn', function() { 90 TEST_F('SyncSetupWebUITestAsync', 'MAYBE_VerifySignIn', function() {
92 // Handle SyncSetupStartSignIn by displaying the sync setup dialog, verifying 91 // Handle SyncSetupStartSignIn by displaying the sync setup dialog, verifying
93 // that a confirmation dialog appears, and clicking OK to dismiss the dialog. 92 // that a confirmation dialog appears, and clicking OK to dismiss the dialog.
94 // Note that this test doesn't actually do a gaia sign in. 93 // Note that this test doesn't actually do a gaia sign in.
95 this.mockHandler.expects(once()).SyncSetupStartSignIn( 94 this.mockHandler.expects(once()).SyncSetupStartSignIn(
96 [false] /* createSupervisedUser */).will(callFunction(function() { 95 [false] /* createSupervisedUser */).will(callFunction(function() {
97 SyncSetupOverlay.showSyncSetupPage('configure'); 96 SyncSetupOverlay.showSyncSetupPage('configure');
98 var okButton = $('confirm-everything-ok'); 97 var okButton = $('confirm-everything-ok');
99 assertNotEquals(null, okButton); 98 assertNotEquals(null, okButton);
100 okButton.click(); 99 okButton.click();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true); 133 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true);
135 assertFalse($('bookmarks-checkbox').checked); 134 assertFalse($('bookmarks-checkbox').checked);
136 135
137 testDone(); 136 testDone();
138 })); 137 }));
139 138
140 this.startSyncing(); 139 this.startSyncing();
141 }); 140 });
142 141
143 GEN('#endif // OS_CHROMEOS'); 142 GEN('#endif // OS_CHROMEOS');
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698