diff options
author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 19:49:08 +0000 |
---|---|---|
committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 19:49:08 +0000 |
commit | c619407508e77a4ec06f5f7dc121c115e4b1469b (patch) | |
tree | bac0448fd45c51f2b7c8fb1d521b3be9f1fe7679 /chrome/browser/in_process_webkit | |
parent | 19abd36fc075d1ddbb8adfb1af78f63b1116bd0a (diff) | |
download | chromium_src-c619407508e77a4ec06f5f7dc121c115e4b1469b.zip chromium_src-c619407508e77a4ec06f5f7dc121c115e4b1469b.tar.gz chromium_src-c619407508e77a4ec06f5f7dc121c115e4b1469b.tar.bz2 |
Adjust flakiness settings to match the adjustments I made to the tests.
TBR=jorlow
BUG=none
TEST=these
Review URL: http://codereview.chromium.org/307044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/in_process_webkit')
-rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_uitest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc index 1574697..377b713 100644 --- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc +++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc @@ -102,20 +102,24 @@ class DOMStorageTest : public UILayoutTest { FilePath test_dir_; }; -TEST_F(DOMStorageTest, DOMStorageLayoutTests) { - InitializeForLayoutTest(test_dir_, FilePath(), false); - AddResources(); - RunTests(kTopLevelFiles); -} - // http://code.google.com/p/chromium/issues/detail?id=24145 // Remove build_config.h include when this is removed. #if defined(OS_WIN) #define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests +#define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests #else #define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests +#define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests #endif // defined(OS_WIN) + +TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) { + InitializeForLayoutTest(test_dir_, FilePath(), false); + AddResources(); + RunTests(kTopLevelFiles); +} + + TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) { InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), false); |