chromium/src
0
Fork 0
Code Activity

Fix and re-enable extension and apps sync e2e tests

Browse Source 
This cl should have no impact for fake server tests.
For extension tests, those flaky tests on mac also flaky on Windows. So
I'll disable them for now.
For apps tests, those corp force added apps having install issues and
always break the test at the beginning. I have verified all whitelist apps
are corp force installed apps.

gtest filter and passing/total numbers:
TwoClientExtensionsSyncTest.*E2ETest* (43/50)
TwoClientExtensionAppsSyncTest.*E2ETest* (121/130)

TEST: Run every test 10 times with no retry.
Bug: 1010568
Change-Id: I44ceeeaf0631c28f0d7c374abcff62af79117633
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1990475
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Sven Zheng <svenzheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730758}
This commit is contained in:
Sven Zheng
2020-01-13 20:10:16 +00:00
committed by Commit Bot
parent 223c4ba8e6
commit 3044807cc0
3 changed files with 2 additions and 15 deletions

5
chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc

@ -59,9 +59,6 @@ class TwoClientExtensionAppsSyncTest : public SyncTest {
~TwoClientExtensionAppsSyncTest() override {}
// Needed for AwaitQuiescence().
bool TestUsesSelfNotifications() override { return true; }
private:
DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionAppsSyncTest);
};
@ -322,8 +319,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionAppsSyncTest,
E2E_ENABLED(UpdateLaunchType)) {
ResetSyncForPrimaryAccount();
ASSERT_TRUE(SetupSync());
// Wait until sync settles before we override the apps below.
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AppsMatchChecker().Wait());
// Change the launch type to window.

4
chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc

@ -38,8 +38,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
ASSERT_TRUE(ExtensionsMatchChecker().Wait());
}
// E2E tests flaky on Mac: https://crbug.com/597319
#if defined(OS_MACOSX)
// E2E tests flaky on Mac and Windows: https://crbug.com/597319
#if defined(OS_MACOSX) || defined(OS_WIN)
#define MAYBE_E2E(test_name) test_name
#else
#define MAYBE_E2E(test_name) E2E_ENABLED(test_name)

8
testing/buildbot/filters/e2e.sync_integration_tests.filter

@ -1,13 +1,5 @@
# TODO(crbug.com/1010568): Enable all sync e2e tests.
-TwoClientDictionarySyncTest.RemoveOnAAddOnB_E2ETest
-TwoClientExtensionAppsSyncTest*
-TwoClientExtensionsSyncTest.UpdateEnableDisableExtension_E2ETest
-TwoClientExtensionsSyncTest.UpdateIncognitoEnableDisable_E2ETest
-TwoClientExtensionsSyncTest.InstallDifferentExtensions_E2ETest
-TwoClientExtensionsSyncTest.StartWithDifferentExtensions_E2ETest
-TwoClientExtensionsSyncTest.StartWithSameExtensions_E2ETest
-TwoClientExtensionsSyncTest.UninstallPreinstalledExtensions_E2ETest
-TwoClientExtensionsSyncTest.Uninstall_E2ETest
-USS/TwoClientPasswordsSyncTest*
-TwoClientSearchEnginesSyncTest.DeleteSyncedDefault_E2ETest
-TwoClientSearchEnginesSyncTest.Delete_E2ETest