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

Unified Diff: chrome/browser/sessions/session_restore_browsertest.cc

Issue 2762573002: Disable SmartSessionRestoreTest.PRE_CorrectLoadingOrder consistently (flaky) (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index eece71e78c9430b1aa0ae941cc6bf568db2181fc..324bf098dc6a241e0d99b0a2ff2b5e6f72667e44 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -1520,7 +1520,16 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TabWithDownloadDoesNotGetRestored) {
}
}
-IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, PRE_CorrectLoadingOrder) {
+// PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN and Mac.
+// See http://crbug.com/493167.
+#if (defined(OS_CHROMEOS) && defined(MEMORY_SANITIZER)) || defined(OS_MACOSX)
+#define MAYBE_PRE_CorrectLoadingOrder DISABLED_PRE_CorrectLoadingOrder
+#define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder
+#else
+#define MAYBE_PRE_CorrectLoadingOrder PRE_CorrectLoadingOrder
+#define MAYBE_CorrectLoadingOrder CorrectLoadingOrder
+#endif
+IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_PRE_CorrectLoadingOrder) {
Profile* profile = browser()->profile();
const int activation_order[] = {4, 2, 1, 5, 0, 3};
@@ -1573,13 +1582,6 @@ IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, PRE_CorrectLoadingOrder) {
new_browser->tab_strip_model()->ActivateTabAt(1, true);
}
-// PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN: https://crbug.com/582323
-// And Mac: https://crbug.com/656687
-#if (defined(OS_CHROMEOS) && defined(MEMORY_SANITIZER)) || defined(OS_MACOSX)
-#define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder
-#else
-#define MAYBE_CorrectLoadingOrder CorrectLoadingOrder
-#endif
IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_CorrectLoadingOrder) {
const int activation_order[] = {4, 2, 5, 0, 3, 1};
Profile* profile = browser()->profile();
« 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