Revert "Remove "sync_integration_tests" from Windows CQ builder."
This reverts commit 6a9c35ee8e.
Reason for revert: Fixed the suite via reverting the breaking change
Bug: 419089901
Original change's description:
> Remove "sync_integration_tests" from Windows CQ builder.
>
> As it is broken right now due to https://crrev.com/c/6568572
> And reverting the CL is non-trivial as it depends on a clank CL as well.
>
> So remove it for now as the mitigation.
>
> Bug: 419089901
> No-Try: true
> Change-Id: I340d57a6b262567f69354313c2a01d9f15f28d8e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6570952
> Reviewed-by: Sky Malice <skym@chromium.org>
> Commit-Queue: Haiyang Pan <hypan@google.com>
> Cr-Commit-Position: refs/heads/main@{#1463070}
Bug: 419089901
Change-Id: I34318898976fccc0a01bc4fd244698543131a095
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6572172
Reviewed-by: Sky Malice <skym@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1463643}
This commit is contained in:
Andrew Grieve
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
386d0644a7
commit
1ec6142639
chrome
components/saved_tab_groups/internal
infra/config
generated
builders
ci
try
win-rel
targets
subprojects
chromium
@ -2,6 +2,7 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
import("sync_integration_tests.gni")
|
||||
if (is_android) {
|
||||
import("//build/config/android/rules.gni")
|
||||
} else {
|
||||
@ -42,33 +43,7 @@ source_set("sync_integration_tests_impl") {
|
||||
"//components/version_info",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"single_client_autofill_profile_sync_test.cc",
|
||||
"single_client_bookmarks_sync_test.cc",
|
||||
"single_client_collaboration_group_sync_test.cc",
|
||||
"single_client_contact_info_sync_test.cc",
|
||||
"single_client_custom_passphrase_sync_test.cc",
|
||||
"single_client_device_info_sync_test.cc",
|
||||
"single_client_history_delete_directives_sync_test.cc",
|
||||
"single_client_history_sync_test.cc",
|
||||
"single_client_offer_sync_test.cc",
|
||||
"single_client_plus_address_setting_sync_test.cc",
|
||||
"single_client_plus_address_sync_test.cc",
|
||||
"single_client_preferences_sync_test.cc",
|
||||
"single_client_reading_list_sync_test.cc",
|
||||
"single_client_shared_tab_group_data_sync_test.cc",
|
||||
"single_client_standalone_transport_sync_test.cc",
|
||||
"single_client_sync_invalidations_test.cc",
|
||||
"sync_exponential_backoff_test.cc",
|
||||
|
||||
# TODO(crbug.com/393119606): After enough of the implementation is ready
|
||||
# (CL #N), add integration tests. Careful, sync_integration_tests runs in CQ
|
||||
# but android_sync_integration_tests do not.
|
||||
|
||||
# TODO(crbug.com/397767033): After enough of the implementation is ready
|
||||
# (CL #N), add integration tests. Careful, sync_integration_tests runs in CQ
|
||||
# but android_sync_integration_tests do not.
|
||||
]
|
||||
sources = sync_integration_tests_sources
|
||||
|
||||
data = [ "//chrome/test/data/sync/" ]
|
||||
|
||||
@ -100,102 +75,6 @@ source_set("sync_integration_tests_impl") {
|
||||
"$root_gen_dir/components/dev_ui_components_resources.pak",
|
||||
]
|
||||
} else { # !is_android
|
||||
sources += [
|
||||
"apps_sync_test_base.cc",
|
||||
"apps_sync_test_base.h",
|
||||
"enable_disable_test.cc",
|
||||
"local_sync_test.cc",
|
||||
"migration_test.cc",
|
||||
"password_manager_sync_test.cc",
|
||||
"single_client_app_settings_sync_test.cc",
|
||||
"single_client_common_sync_test.cc",
|
||||
"single_client_dictionary_sync_test.cc",
|
||||
"single_client_extension_apps_sync_test.cc",
|
||||
"single_client_extensions_sync_test.cc",
|
||||
"single_client_incoming_password_sharing_invitation_test.cc",
|
||||
"single_client_nigori_sync_test.cc",
|
||||
"single_client_outgoing_password_sharing_invitation_test.cc",
|
||||
"single_client_password_sharing_policy_test.cc",
|
||||
"single_client_passwords_sync_test.cc",
|
||||
"single_client_polling_sync_test.cc",
|
||||
"single_client_product_specifications_sync_test.cc",
|
||||
"single_client_saved_tab_groups_sync_test.cc",
|
||||
"single_client_search_engines_sync_test.cc",
|
||||
"single_client_secondary_account_sync_test.cc",
|
||||
"single_client_send_tab_to_self_sync_test.cc",
|
||||
"single_client_sessions_sync_test.cc",
|
||||
"single_client_sharing_message_sync_test.cc",
|
||||
"single_client_themes_sync_test.cc",
|
||||
"single_client_user_consents_sync_test.cc",
|
||||
"single_client_user_events_sync_test.cc",
|
||||
"single_client_valuables_sync_test.cc",
|
||||
"single_client_wallet_credential_sync_test.cc",
|
||||
"single_client_wallet_sync_test.cc",
|
||||
"single_client_web_apps_sync_generated_icon_fix_sync_test.cc",
|
||||
"single_client_web_apps_sync_test.cc",
|
||||
"single_client_webauthn_credentials_sync_test.cc",
|
||||
"sync_auth_test.cc",
|
||||
"sync_errors_test.cc",
|
||||
"web_apps_sync_test_base.cc",
|
||||
"web_apps_sync_test_base.h",
|
||||
|
||||
# Tests with two clients can't run on Android.
|
||||
"two_client_app_settings_sync_test.cc",
|
||||
"two_client_autocomplete_sync_test.cc",
|
||||
"two_client_autofill_sync_test.cc",
|
||||
"two_client_bookmarks_sync_test.cc",
|
||||
"two_client_contact_info_sync_test.cc",
|
||||
"two_client_custom_passphrase_sync_test.cc",
|
||||
"two_client_dictionary_sync_test.cc",
|
||||
"two_client_extension_apps_sync_test.cc",
|
||||
"two_client_extension_settings_sync_test.cc",
|
||||
"two_client_extensions_sync_test.cc",
|
||||
"two_client_history_sync_test.cc",
|
||||
"two_client_passwords_sync_test.cc",
|
||||
"two_client_power_bookmarks_sync_test.cc",
|
||||
"two_client_preferences_sync_test.cc",
|
||||
"two_client_search_engines_sync_test.cc",
|
||||
"two_client_send_tab_to_self_sync_test.cc",
|
||||
"two_client_sessions_sync_test.cc",
|
||||
"two_client_shared_tab_group_data_sync_test.cc",
|
||||
"two_client_themes_sync_test.cc",
|
||||
"two_client_user_events_sync_test.cc",
|
||||
"two_client_wallet_credential_sync_test.cc",
|
||||
"two_client_wallet_sync_test.cc",
|
||||
"two_client_web_apps_bmo_sync_test.cc",
|
||||
"two_client_web_apps_generated_icon_fix_test.cc",
|
||||
"two_client_web_apps_integration_test.cc",
|
||||
"two_client_web_apps_integration_test_base.cc",
|
||||
"two_client_web_apps_integration_test_base.h",
|
||||
"two_client_web_apps_sync_test.cc",
|
||||
"two_client_webauthn_credentials_sync_test.cc",
|
||||
]
|
||||
if (is_win || is_mac || is_linux) {
|
||||
sources += [ "two_client_web_apps_integration_test_mac_win_linux.cc" ]
|
||||
}
|
||||
|
||||
if (is_win || is_linux) {
|
||||
sources += [ "two_client_web_apps_integration_test_win_linux.cc" ]
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
sources += [ "two_client_web_apps_integration_test_mac.cc" ]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
sources += [ "two_client_web_apps_integration_test_win.cc" ]
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
sources += [ "two_client_web_apps_integration_test_cros.cc" ]
|
||||
}
|
||||
|
||||
if (!is_chromeos) {
|
||||
sources += [
|
||||
"select_type_and_migrate_local_data_items_when_active_sync_test.cc",
|
||||
]
|
||||
}
|
||||
|
||||
deps += [
|
||||
"//chrome:packed_resources",
|
||||
"//chrome:resources",
|
||||
@ -255,12 +134,6 @@ source_set("sync_integration_tests_impl") {
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
# Dictionary sync is disabled on Mac.
|
||||
sources -= [
|
||||
"single_client_dictionary_sync_test.cc",
|
||||
"two_client_dictionary_sync_test.cc",
|
||||
]
|
||||
|
||||
data_deps += [
|
||||
"//chrome",
|
||||
"//chrome:chrome_framework",
|
||||
|
||||
124
chrome/browser/sync/test/integration/sync_integration_tests.gni
Normal file
124
chrome/browser/sync/test/integration/sync_integration_tests.gni
Normal file
@ -0,0 +1,124 @@
|
||||
# Copyright 2021 The Chromium Authors
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
sync_integration_tests_sources = [
|
||||
"//chrome/browser/sync/test/integration/single_client_autofill_profile_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_collaboration_group_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_contact_info_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_device_info_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_history_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_offer_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_plus_address_setting_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_plus_address_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_reading_list_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_shared_tab_group_data_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_standalone_transport_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_sync_invalidations_test.cc",
|
||||
"//chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc",
|
||||
|
||||
# TODO(crbug.com/393119606): After enough of the implementation is ready
|
||||
# (CL #N), add integration tests. Careful, sync_integration_tests runs in CQ
|
||||
# but android_sync_integration_tests do not.
|
||||
# TODO(crbug.com/397767033): After enough of the implementation is ready
|
||||
# (CL #N), add integration tests. Careful, sync_integration_tests runs in CQ
|
||||
# but android_sync_integration_tests do not.
|
||||
]
|
||||
if (!is_android) {
|
||||
sync_integration_tests_sources += [
|
||||
"//chrome/browser/sync/test/integration/apps_sync_test_base.cc",
|
||||
"//chrome/browser/sync/test/integration/apps_sync_test_base.h",
|
||||
"//chrome/browser/sync/test/integration/enable_disable_test.cc",
|
||||
"//chrome/browser/sync/test/integration/local_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/migration_test.cc",
|
||||
"//chrome/browser/sync/test/integration/password_manager_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_app_settings_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_common_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_incoming_password_sharing_invitation_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_outgoing_password_sharing_invitation_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_password_sharing_policy_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_polling_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_product_specifications_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_saved_tab_groups_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_secondary_account_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_sharing_message_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_themes_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_user_consents_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_valuables_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_wallet_credential_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_web_apps_sync_generated_icon_fix_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_web_apps_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/single_client_webauthn_credentials_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/sync_auth_test.cc",
|
||||
"//chrome/browser/sync/test/integration/sync_errors_test.cc",
|
||||
|
||||
# Tests with two clients can't run on Android.
|
||||
"//chrome/browser/sync/test/integration/two_client_app_settings_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_contact_info_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_custom_passphrase_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_history_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_power_bookmarks_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_shared_tab_group_data_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_themes_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_user_events_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_wallet_credential_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_generated_icon_fix_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_integration_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_base.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_base.h",
|
||||
"//chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_webauthn_credentials_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/web_apps_sync_test_base.cc",
|
||||
"//chrome/browser/sync/test/integration/web_apps_sync_test_base.h",
|
||||
]
|
||||
if (!is_mac) {
|
||||
# Dictionary sync is disabled on Mac.
|
||||
sync_integration_tests_sources += [
|
||||
"//chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc",
|
||||
"//chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc",
|
||||
]
|
||||
}
|
||||
}
|
||||
if (is_win || is_mac || is_linux) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc" ]
|
||||
}
|
||||
if (is_win || is_linux) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_win_linux.cc" ]
|
||||
}
|
||||
if (is_mac) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac.cc" ]
|
||||
}
|
||||
if (is_win) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_win.cc" ]
|
||||
}
|
||||
if (is_chromeos) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc" ]
|
||||
}
|
||||
if (!is_chromeos && !is_android) {
|
||||
sync_integration_tests_sources += [ "//chrome/browser/sync/test/integration/select_type_and_migrate_local_data_items_when_active_sync_test.cc" ]
|
||||
}
|
||||
@ -15,6 +15,7 @@ import("//chrome/browser/buildflags.gni")
|
||||
import("//chrome/browser/downgrade/buildflags.gni")
|
||||
import("//chrome/browser/page_load_metrics/integration_tests/jsdeps.gni")
|
||||
import("//chrome/browser/page_load_metrics/integration_tests/sources.gni")
|
||||
import("//chrome/browser/sync/test/integration/sync_integration_tests.gni")
|
||||
import("//chrome/common/features.gni")
|
||||
import("//chrome/services/speech/buildflags/buildflags.gni")
|
||||
import("//chrome/test/include_js_tests.gni")
|
||||
@ -12127,10 +12128,131 @@ source_set("sync_integration_test_support") {
|
||||
}
|
||||
|
||||
if (!is_android) {
|
||||
test("sync_integration_tests") {
|
||||
use_xvfb = use_xvfb_in_this_config
|
||||
deps =
|
||||
[ "//chrome/browser/sync/test/integration:sync_integration_tests_impl" ]
|
||||
if (is_win) {
|
||||
# TODO(crbug.com/419089901): Figure out why the below
|
||||
# sync_integration_tests does not work on Windows.
|
||||
test("sync_integration_tests") {
|
||||
sources = sync_integration_tests_sources
|
||||
|
||||
data = [
|
||||
"//chrome/test/data/password/",
|
||||
"//chrome/test/data/sync/",
|
||||
"//chrome/test/data/webapps_integration/",
|
||||
"//chrome/test/data/web_apps/",
|
||||
"//chrome/test/data/banners/",
|
||||
"//net/tools/testserver/",
|
||||
"//third_party/pywebsocket3/src/mod_pywebsocket/",
|
||||
]
|
||||
|
||||
# TODO(phajdan.jr): Only temporary, to make transition easier.
|
||||
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
|
||||
|
||||
deps = [
|
||||
":browser_tests_runner",
|
||||
":sync_integration_test_support",
|
||||
":test_support",
|
||||
":test_support_ui",
|
||||
"//chrome:packed_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
"//chrome/app:chrome_dll_resources",
|
||||
"//chrome/app:command_ids",
|
||||
"//chrome/browser/affiliations",
|
||||
"//chrome/browser/apps/link_capturing",
|
||||
"//chrome/browser/autofill",
|
||||
"//chrome/browser/browsing_data:constants",
|
||||
"//chrome/browser/metrics/desktop_session_duration",
|
||||
"//chrome/browser/plus_addresses",
|
||||
"//chrome/browser/prefs",
|
||||
"//chrome/browser/reading_list",
|
||||
"//chrome/browser/search_engines",
|
||||
"//chrome/browser/sync",
|
||||
"//chrome/browser/themes",
|
||||
"//chrome/browser/ui:browser_navigator_params_headers",
|
||||
"//chrome/browser/ui:ui_features",
|
||||
"//chrome/browser/web_applications:features",
|
||||
"//chrome/browser/web_applications:web_applications_test_support",
|
||||
"//chrome/common",
|
||||
"//chrome/renderer",
|
||||
"//components/app_constants",
|
||||
"//components/bookmarks/browser",
|
||||
"//components/bookmarks/test",
|
||||
"//components/browser_sync",
|
||||
"//components/commerce/core:feature_list",
|
||||
"//components/consent_auditor",
|
||||
"//components/data_sharing/public",
|
||||
"//components/favicon/core",
|
||||
"//components/history/content/browser",
|
||||
"//components/history/core/common",
|
||||
"//components/password_manager/core/browser/sharing",
|
||||
"//components/plus_addresses",
|
||||
"//components/plus_addresses:test_support",
|
||||
"//components/plus_addresses/settings",
|
||||
"//components/plus_addresses/settings:test_support",
|
||||
"//components/plus_addresses/webdata",
|
||||
"//components/power_bookmarks/common:test_support",
|
||||
"//components/power_bookmarks/core",
|
||||
"//components/reading_list/core",
|
||||
"//components/reading_list/core:test_support",
|
||||
"//components/saved_tab_groups/internal:tab_group_sync_bridge",
|
||||
"//components/saved_tab_groups/test_support",
|
||||
"//components/search_engines",
|
||||
"//components/send_tab_to_self",
|
||||
"//components/spellcheck/common",
|
||||
"//components/sync",
|
||||
"//components/sync:test_support",
|
||||
"//components/sync_bookmarks",
|
||||
"//components/sync_device_info:test_support",
|
||||
"//components/sync_preferences:common_syncable_prefs_database",
|
||||
"//components/trusted_vault",
|
||||
"//components/trusted_vault:test_support",
|
||||
"//components/undo",
|
||||
"//components/version_info",
|
||||
"//components/webapps/browser",
|
||||
"//components/webapps/common",
|
||||
"//components/webauthn/core/browser",
|
||||
"//components/webauthn/core/browser:passkey_model",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
"//third_party/blink/public:blink",
|
||||
"//third_party/icu",
|
||||
"//third_party/leveldatabase",
|
||||
]
|
||||
|
||||
data_deps = [
|
||||
"//testing:test_scripts_shared",
|
||||
"//testing/buildbot/filters:sync_integration_tests_filters",
|
||||
"//third_party/angle:includes",
|
||||
]
|
||||
|
||||
data_deps += [ "//chrome:packed_resources" ]
|
||||
|
||||
deps += [
|
||||
"//chrome:other_version",
|
||||
"//third_party/wtl",
|
||||
"//ui/resources",
|
||||
]
|
||||
|
||||
if (toolkit_views) {
|
||||
deps += [ "//ui/views" ]
|
||||
}
|
||||
if (enable_printing) {
|
||||
deps += [ "//printing" ]
|
||||
}
|
||||
if (enable_glic) {
|
||||
deps += [
|
||||
"//chrome/browser/glic",
|
||||
"//chrome/browser/glic/test_support",
|
||||
]
|
||||
}
|
||||
}
|
||||
} else {
|
||||
test("sync_integration_tests") {
|
||||
use_xvfb = use_xvfb_in_this_config
|
||||
deps = [
|
||||
"//chrome/browser/sync/test/integration:sync_integration_tests_impl",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
test("sync_performance_tests") {
|
||||
|
||||
@ -219,7 +219,7 @@ source_set("tab_group_sync_bridge") {
|
||||
"//chrome/browser/sync/test/integration:*",
|
||||
"//chrome/browser/ui",
|
||||
"//chrome/browser/ui/tabs:tab_group_impl",
|
||||
"//chrome/test:browser_tests",
|
||||
"//chrome/test:*",
|
||||
"//ios/chrome/browser/saved_tab_groups/model",
|
||||
"//ios/chrome/test/app:test_support",
|
||||
]
|
||||
|
||||
@ -1435,6 +1435,24 @@
|
||||
"test": "storage_unittests",
|
||||
"test_id_prefix": "ninja://storage:storage_unittests/"
|
||||
},
|
||||
{
|
||||
"ci_only": true,
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"script": "//testing/merge_scripts/standard_gtest_merge.py"
|
||||
},
|
||||
"name": "sync_integration_tests",
|
||||
"swarming": {
|
||||
"dimensions": {
|
||||
"cpu": "x86-64",
|
||||
"os": "Windows-10-19045"
|
||||
},
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
|
||||
"shards": 3
|
||||
},
|
||||
"test": "sync_integration_tests",
|
||||
"test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
|
||||
},
|
||||
{
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
|
||||
@ -1411,6 +1411,24 @@
|
||||
"test": "storage_unittests",
|
||||
"test_id_prefix": "ninja://storage:storage_unittests/"
|
||||
},
|
||||
{
|
||||
"ci_only": true,
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"script": "//testing/merge_scripts/standard_gtest_merge.py"
|
||||
},
|
||||
"name": "sync_integration_tests",
|
||||
"swarming": {
|
||||
"dimensions": {
|
||||
"cpu": "x86-64",
|
||||
"os": "Windows-10-19045"
|
||||
},
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
|
||||
"shards": 3
|
||||
},
|
||||
"test": "sync_integration_tests",
|
||||
"test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
|
||||
},
|
||||
{
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
|
||||
@ -1435,6 +1435,24 @@
|
||||
"test": "storage_unittests",
|
||||
"test_id_prefix": "ninja://storage:storage_unittests/"
|
||||
},
|
||||
{
|
||||
"ci_only": true,
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"script": "//testing/merge_scripts/standard_gtest_merge.py"
|
||||
},
|
||||
"name": "sync_integration_tests",
|
||||
"swarming": {
|
||||
"dimensions": {
|
||||
"cpu": "x86-64",
|
||||
"os": "Windows-10-19045"
|
||||
},
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
|
||||
"shards": 3
|
||||
},
|
||||
"test": "sync_integration_tests",
|
||||
"test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
|
||||
},
|
||||
{
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
|
||||
@ -461,14 +461,11 @@ ci.builder(
|
||||
shards = 4,
|
||||
),
|
||||
),
|
||||
# TODO(crbug.com/419089901): Re-enable after the suite works.
|
||||
#"sync_integration_tests": targets.mixin(
|
||||
# swarming = targets.swarming(
|
||||
# shards = 3,
|
||||
# ),
|
||||
#),
|
||||
"sync_integration_tests": targets.remove(
|
||||
reason = "Having infra failure (crbug.com/419089901)",
|
||||
"sync_integration_tests": targets.mixin(
|
||||
ci_only = True,
|
||||
swarming = targets.swarming(
|
||||
shards = 3,
|
||||
),
|
||||
),
|
||||
"sync_integration_tests_no_field_trial": targets.remove(
|
||||
reason = "Having infra failure (crbug.com/419179070)",
|
||||
|
||||
Reference in New Issue
Block a user