Commit 8126cf1d authored by Kentaro Hara's avatar Kentaro Hara Committed by Commit Bot

Reenable SingleClientAppsSync tests

The real cause was fixed by https://chromium-review.googlesource.com/c/chromium/src/+/1773403/.
This CL reenables the tests.

Bug: 997984
Change-Id: I1ba114f71953f9d75363bbb560a7a3472ed92984
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772871
Auto-Submit: Kentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691561}
parent b3e99d08
...@@ -24,29 +24,12 @@ class SingleClientAppsSyncTest : public SyncTest { ...@@ -24,29 +24,12 @@ class SingleClientAppsSyncTest : public SyncTest {
DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest); DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest);
}; };
// crbug.com/997984 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) {
#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER)
#define MAYBE_StartWithNoApps DISABLED_StartWithNoApps
#define MAYBE_StartWithSomeLegacyApps DISABLED_StartWithSomeLegacyApps
#define MAYBE_StartWithSomePlatformApps DISABLED_StartWithSomePlatformApps
#define MAYBE_InstallSomeLegacyApps DISABLED_InstallSomeLegacyApps
#define MAYBE_InstallSomePlatformApps DISABLED_InstallSomePlatformApps
#define MAYBE_InstallSomeApps DISABLED_InstallSomeApps
#else
#define MAYBE_StartWithNoApps StartWithNoApps
#define MAYBE_StartWithSomeLegacyApps StartWithSomeLegacyApps
#define MAYBE_StartWithSomePlatformApps StartWithSomePlatformApps
#define MAYBE_InstallSomeLegacyApps InstallSomeLegacyApps
#define MAYBE_InstallSomePlatformApps InstallSomePlatformApps
#define MAYBE_InstallSomeApps InstallSomeApps
#endif
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithNoApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomeLegacyApps) { IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomeLegacyApps) {
ASSERT_TRUE(SetupClients()); ASSERT_TRUE(SetupClients());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -59,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomeLegacyApps) ...@@ -59,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomeLegacyApps)
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomePlatformApps) { IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomePlatformApps) {
ASSERT_TRUE(SetupClients()); ASSERT_TRUE(SetupClients());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -72,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomePlatformApps ...@@ -72,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_StartWithSomePlatformApps
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomeLegacyApps) { IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeLegacyApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -85,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomeLegacyApps) { ...@@ -85,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomeLegacyApps) {
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomePlatformApps) { IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomePlatformApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -98,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomePlatformApps) ...@@ -98,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomePlatformApps)
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, MAYBE_InstallSomeApps) { IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
int i = 0; int i = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment