diff options
| author | hichris123 <hichris123@gmail.com> | 2015-02-17 19:43:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-18 03:44:23 +0000 |
| commit | 9b1819737673da56380222328c22795df8d58353 (patch) | |
| tree | 050198aa656355e0b6f89b5483b3d02525609ecf /sync/util | |
| parent | 9382ab44c8438b90cb0afe4de1832189661cc3df (diff) | |
| download | chromium_src-9b1819737673da56380222328c22795df8d58353.zip chromium_src-9b1819737673da56380222328c22795df8d58353.tar.gz chromium_src-9b1819737673da56380222328c22795df8d58353.tar.bz2 | |
Re-enable some sync_unit_tests
This CL re-enables ImmutableTest.Dequeue, CryptographerTest.EncryptExportDecrypt, and SyncNigoriTest.ExportImport on Windows.
BUG=55180, 55178, 129128
Review URL: https://codereview.chromium.org/930603003
Cr-Commit-Position: refs/heads/master@{#316764}
Diffstat (limited to 'sync/util')
| -rw-r--r-- | sync/util/cryptographer_unittest.cc | 8 | ||||
| -rw-r--r-- | sync/util/nigori_unittest.cc | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc index 94a20c8..b1f7e6e 100644 --- a/sync/util/cryptographer_unittest.cc +++ b/sync/util/cryptographer_unittest.cc @@ -138,13 +138,7 @@ TEST_F(CryptographerTest, AddKeySetsDefault) { EXPECT_EQ(encrypted3.key_name(), encrypted4.key_name()); } -// Crashes, Bug 55178. -#if defined(OS_WIN) -#define MAYBE_EncryptExportDecrypt DISABLED_EncryptExportDecrypt -#else -#define MAYBE_EncryptExportDecrypt EncryptExportDecrypt -#endif -TEST_F(CryptographerTest, MAYBE_EncryptExportDecrypt) { +TEST_F(CryptographerTest, EncryptExportDecrypt) { sync_pb::EncryptedData nigori; sync_pb::EncryptedData encrypted; diff --git a/sync/util/nigori_unittest.cc b/sync/util/nigori_unittest.cc index 88c2461..c7b8d6f 100644 --- a/sync/util/nigori_unittest.cc +++ b/sync/util/nigori_unittest.cc @@ -130,13 +130,7 @@ TEST(SyncNigoriTest, CorruptedCiphertext) { EXPECT_NE(plaintext, decrypted); } -// Crashes, Bug 55180. -#if defined(OS_WIN) -#define MAYBE_ExportImport DISABLED_ExportImport -#else -#define MAYBE_ExportImport ExportImport -#endif -TEST(SyncNigoriTest, MAYBE_ExportImport) { +TEST(SyncNigoriTest, ExportImport) { Nigori nigori1; EXPECT_TRUE(nigori1.InitByDerivation("example.com", "username", "password")); |