Commit 83b4a42e authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

Disable tests for UKMTestCase

Bug: 806784
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I687c994bc89696eed93f58f93621740b0fc3c37e
Reviewed-on: https://chromium-review.googlesource.com/891234
Commit-Queue: Louis Romero <lpromero@chromium.org>
Reviewed-by: default avatarLouis Romero <lpromero@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532435}
parent 6110c9ca
...@@ -298,7 +298,13 @@ void SignOut() { ...@@ -298,7 +298,13 @@ void SignOut() {
// //chrome/browser/metrics/ukm_browsertest.cc // //chrome/browser/metrics/ukm_browsertest.cc
// Make sure that UKM is disabled while an incognito tab is open. // Make sure that UKM is disabled while an incognito tab is open.
- (void)testRegularPlusIncognito { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testRegularPlusIncognito testRegularPlusIncognito
#else
#define MAYBE_testRegularPlusIncognito FLAKY_testRegularPlusIncognito
#endif
- (void)MAYBE_testRegularPlusIncognito {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
OpenNewIncognitoTab(); OpenNewIncognitoTab();
...@@ -323,7 +329,13 @@ void SignOut() { ...@@ -323,7 +329,13 @@ void SignOut() {
} }
// Make sure opening a real tab after Incognito doesn't enable UKM. // Make sure opening a real tab after Incognito doesn't enable UKM.
- (void)testIncognitoPlusRegular { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testIncognitoPlusRegular testIncognitoPlusRegular
#else
#define MAYBE_testIncognitoPlusRegular FLAKY_testIncognitoPlusRegular
#endif
- (void)MAYBE_testIncognitoPlusRegular {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
chrome_test_util::CloseAllTabs(); chrome_test_util::CloseAllTabs();
[ChromeEarlGrey waitForMainTabCount:(0)]; [ChromeEarlGrey waitForMainTabCount:(0)];
...@@ -347,7 +359,13 @@ void SignOut() { ...@@ -347,7 +359,13 @@ void SignOut() {
// testOpenNonSync not needed, since there can't be multiple profiles. // testOpenNonSync not needed, since there can't be multiple profiles.
// Make sure that UKM is disabled when metrics consent is revoked. // Make sure that UKM is disabled when metrics consent is revoked.
- (void)testMetricsConsent { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testMetricsConsent testMetricsConsent
#else
#define MAYBE_testMetricsConsent FLAKY_testMetricsConsent
#endif
- (void)MAYBE_testMetricsConsent {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
UpdateMetricsConsent(false); UpdateMetricsConsent(false);
...@@ -363,7 +381,13 @@ void SignOut() { ...@@ -363,7 +381,13 @@ void SignOut() {
} }
// Make sure that providing metrics consent doesn't enable UKM w/o sync. // Make sure that providing metrics consent doesn't enable UKM w/o sync.
- (void)testConsentAddedButNoSync { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testConsentAddedButNoSync testConsentAddedButNoSync
#else
#define MAYBE_testConsentAddedButNoSync FLAKY_testConsentAddedButNoSync
#endif
- (void)MAYBE_testConsentAddedButNoSync {
SignOut(); SignOut();
UpdateMetricsConsent(false); UpdateMetricsConsent(false);
AssertUKMEnabled(false); AssertUKMEnabled(false);
...@@ -376,7 +400,13 @@ void SignOut() { ...@@ -376,7 +400,13 @@ void SignOut() {
} }
// Make sure that UKM is disabled when sync is disabled. // Make sure that UKM is disabled when sync is disabled.
- (void)testSingleDisableSync { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testSingleDisableSync testSingleDisableSync
#else
#define MAYBE_testSingleDisableSync FLAKY_testSingleDisableSync
#endif
- (void)MAYBE_testSingleDisableSync {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
...@@ -425,7 +455,13 @@ void SignOut() { ...@@ -425,7 +455,13 @@ void SignOut() {
// TODO(crbug.com/793082): Implement testSecondaryPassphrase. // TODO(crbug.com/793082): Implement testSecondaryPassphrase.
// Make sure that UKM is disabled when sync is not enabled. // Make sure that UKM is disabled when sync is not enabled.
- (void)testSingleSyncSignout { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testSingleSyncSignout testSingleSyncSignout
#else
#define MAYBE_testSingleSyncSignout FLAKY_testSingleSyncSignout
#endif
- (void)MAYBE_testSingleSyncSignout {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
SignOut(); SignOut();
...@@ -448,7 +484,13 @@ void SignOut() { ...@@ -448,7 +484,13 @@ void SignOut() {
// testMetricsReporting not needed, since iOS doesn't use sampling. // testMetricsReporting not needed, since iOS doesn't use sampling.
- (void)testHistoryDelete { // TODO(crbug.com/806784): Re-enable this test on devices.
#if TARGET_OS_SIMULATOR
#define MAYBE_testHistoryDelete testHistoryDelete
#else
#define MAYBE_testHistoryDelete FLAKY_testHistoryDelete
#endif
- (void)MAYBE_testHistoryDelete {
uint64_t original_client_id = metrics::UkmEGTestHelper::client_id(); uint64_t original_client_id = metrics::UkmEGTestHelper::client_id();
const ukm::SourceId kDummySourceId = 0x54321; const ukm::SourceId kDummySourceId = 0x54321;
......
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