| Index: components/leveldb/leveldb_apptest.cc
|
| diff --git a/components/leveldb/leveldb_apptest.cc b/components/leveldb/leveldb_apptest.cc
|
| index 2a99adcd3ed9731cc44f32bb6477ea0dae21700c..104c829400d2e526965a60c1c83b726761e66d8b 100644
|
| --- a/components/leveldb/leveldb_apptest.cc
|
| +++ b/components/leveldb/leveldb_apptest.cc
|
| @@ -52,7 +52,13 @@ class LevelDBApptest : public mojo::test::ApplicationTestBase {
|
| DISALLOW_COPY_AND_ASSIGN(LevelDBApptest);
|
| };
|
|
|
| -TEST_F(LevelDBApptest, Basic) {
|
| +#if defined(OS_LINUX)
|
| +// Flaky on Linux: http://crbug.com/594977,
|
| +#define MAYBE_Basic DISABLED_Basic
|
| +#else
|
| +#define MAYBE_Basic Basic
|
| +#endif
|
| +TEST_F(LevelDBApptest, MAYBE_Basic) {
|
| filesystem::DirectoryPtr directory;
|
| GetUserDataDir(&directory);
|
|
|
| @@ -268,6 +274,12 @@ TEST_F(LevelDBApptest, GetFromSnapshots) {
|
| EXPECT_EQ("value", value.To<std::string>());
|
| }
|
|
|
| +#if defined(OS_LINUX)
|
| +// Flaky on Linux: http://crbug.com/594977,
|
| +#define MAYBE_InvalidArgumentOnInvalidSnapshot DISABLED_InvalidArgumentOnInvalidSnapshot
|
| +#else
|
| +#define MAYBE_InvalidArgumentOnInvalidSnapshot InvalidArgumentOnInvalidSnapshot
|
| +#endif
|
| TEST_F(LevelDBApptest, InvalidArgumentOnInvalidSnapshot) {
|
| filesystem::DirectoryPtr directory;
|
| GetUserDataDir(&directory);
|
|
|