diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 02:12:37 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 02:12:37 +0000 |
| commit | 8bda37982625717b2b194d61f527ffbbd9cd4ba0 (patch) | |
| tree | 0f783da215072ac2679095a8c6f39a477da7b655 /webkit/quota | |
| parent | cdd8b38dee9e50540580f02b793e9a2fa0d0f6eb (diff) | |
| download | chromium_src-8bda37982625717b2b194d61f527ffbbd9cd4ba0.zip chromium_src-8bda37982625717b2b194d61f527ffbbd9cd4ba0.tar.gz chromium_src-8bda37982625717b2b194d61f527ffbbd9cd4ba0.tar.bz2 | |
Disable QuotaMananger tests which rely on precise time.
The tests were storing time values in SQLite, and different inserts
were all the same. Previous version of SQLite was returning them in
the order inserted (test succeeded), current version returns a
different order (test fails).
TBR=kinuko@chromium.org
BUG=83805
TEST=none
Review URL: http://codereview.chromium.org/7067045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/quota')
| -rw-r--r-- | webkit/quota/quota_manager_unittest.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc index 87599ca..e64edbb 100644 --- a/webkit/quota/quota_manager_unittest.cc +++ b/webkit/quota/quota_manager_unittest.cc @@ -924,7 +924,18 @@ TEST_F(QuotaManagerTest, GetCachedOrigins) { } } -TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) { +#if defined(OS_WIN) +// http://crbug.com/83805. Time is too granular for the LRU tests on +// Windows, and a new version of SQLite is returning values in a +// different (implementation-defined and appropriate) order. +#define MAYBE_NotifyAndLRUOrigin DISABLED_NotifyAndLRUOrigin +#define MAYBE_GetLRUOriginWithOriginInUse DISABLED_GetLRUOriginWithOriginInUse +#else +#define MAYBE_NotifyAndLRUOrigin NotifyAndLRUOrigin +#define MAYBE_GetLRUOriginWithOriginInUse GetLRUOriginWithOriginInUse +#endif + +TEST_F(QuotaManagerTest, MAYBE_NotifyAndLRUOrigin) { static const MockOriginData kData[] = { { "http://a.com/", kStorageTypeTemporary, 0 }, { "http://a.com:1/", kStorageTypeTemporary, 0 }, @@ -963,7 +974,7 @@ TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) { EXPECT_EQ("http://c.com/", lru_origin().spec()); } -TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) { +TEST_F(QuotaManagerTest, MAYBE_GetLRUOriginWithOriginInUse) { static const MockOriginData kData[] = { { "http://a.com/", kStorageTypeTemporary, 0 }, { "http://a.com:1/", kStorageTypeTemporary, 0 }, |