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

Side by Side Diff: chrome/browser/in_process_webkit/dom_storage_uitest.cc

Issue 338024: Mark DOMStorageTest.SessionStorageLayoutTests as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | Annotate | Revision Log
« 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/common/chrome_switches.h" 6 #include "chrome/common/chrome_switches.h"
7 #include "chrome/test/automation/tab_proxy.h" 7 #include "chrome/test/automation/tab_proxy.h"
8 #include "chrome/test/ui/ui_layout_test.h" 8 #include "chrome/test/ui/ui_layout_test.h"
9 9
10 // TODO(jorlow): Enable all of these tests, eventually... 10 // TODO(jorlow): Enable all of these tests, eventually...
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 101
102 FilePath test_dir_; 102 FilePath test_dir_;
103 }; 103 };
104 104
105 // http://code.google.com/p/chromium/issues/detail?id=24145 105 // http://code.google.com/p/chromium/issues/detail?id=24145
106 // Remove build_config.h include when this is removed. 106 // Remove build_config.h include when this is removed.
107 #if defined(OS_WIN) 107 #if defined(OS_WIN)
108 #define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests 108 #define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests
109 #define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests 109 #define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests
110 #define MAYBE_SessionStorageLayoutTests FLAKY_SessionStorageLayoutTests
110 #else 111 #else
111 #define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests 112 #define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests
112 #define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests 113 #define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests
114 #define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests
113 #endif // defined(OS_WIN) 115 #endif // defined(OS_WIN)
114 116
115 117
116 TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) { 118 TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) {
117 InitializeForLayoutTest(test_dir_, FilePath(), false); 119 InitializeForLayoutTest(test_dir_, FilePath(), false);
118 AddResources(); 120 AddResources();
119 RunTests(kTopLevelFiles); 121 RunTests(kTopLevelFiles);
120 } 122 }
121 123
122 124
123 TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) { 125 TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) {
124 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), 126 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"),
125 false); 127 false);
126 AddResources(); 128 AddResources();
127 RunTests(kNoEventsFiles); 129 RunTests(kNoEventsFiles);
128 RunTests(kEventsFiles); 130 RunTests(kEventsFiles);
129 RunTests(kLocalStorageFiles); 131 RunTests(kLocalStorageFiles);
130 } 132 }
131 133
132 TEST_F(DOMStorageTest, SessionStorageLayoutTests) { 134 TEST_F(DOMStorageTest, MAYBE_SessionStorageLayoutTests) {
133 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"), 135 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"),
134 false); 136 false);
135 AddResources(); 137 AddResources();
136 RunTests(kNoEventsFiles); 138 RunTests(kNoEventsFiles);
137 //RunTests(kEventsFiles); 139 //RunTests(kEventsFiles);
138 RunTests(kSessionStorageFiles); 140 RunTests(kSessionStorageFiles);
139 } 141 }
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