Skip to content

Commit

Permalink
Re-enable iPad tests
Browse files Browse the repository at this point in the history 
crrev.com/c/3615614 should have fixed these issues too.

Bug: 1310946
Bug: 1316604
Bug: 1308423
Change-Id: I42ac5b3a572fca82e31bbe733ce0c4af9d2a0248
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3616961
Commit-Queue: Leonid Baraz <lbaraz@chromium.org>
Auto-Submit: Leonid Baraz <lbaraz@chromium.org>
Reviewed-by: Vignesh Shenvi <vshenvi@google.com>
Cr-Commit-Position: refs/heads/main@{#997764}
  • Loading branch information
Leonid Baraz authored and Chromium LUCI CQ committed Apr 29, 2022
1 parent c041da6 commit 072f5ed
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 121 deletions.
10 changes: 1 addition & 9 deletions components/reporting/storage/storage_queue_stress_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,8 @@ class StorageQueueStressTest : public ::testing::TestWithParam<size_t> {
TestUploadClient::LastRecordDigestMap last_record_digest_map_;
};

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload \
FLAKY_WriteIntoNewStorageQueueReopenWriteMoreAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload \
WriteIntoNewStorageQueueReopenWriteMoreAndUpload
#endif
TEST_P(StorageQueueStressTest,
MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload) {
WriteIntoNewStorageQueueReopenWriteMoreAndUpload) {
for (size_t iStart = 0; iStart < kTotalQueueStarts; ++iStart) {
test::TestCallbackWaiter write_waiter;
base::RepeatingCallback<void(Status)> cb = base::BindRepeating(
Expand Down
125 changes: 13 additions & 112 deletions components/reporting/storage/storage_queue_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,15 +674,7 @@ constexpr std::array<const char*, 3> kData = {"Rec1111", "Rec222", "Rec33"};
constexpr std::array<const char*, 3> kMoreData = {"More1111", "More222",
"More33"};

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueAndReopen \
FLAKY_WriteIntoNewStorageQueueAndReopen
#else
#define MAYBE_WriteIntoNewStorageQueueAndReopen \
WriteIntoNewStorageQueueAndReopen
#endif
TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndReopen) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueAndReopen) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand All @@ -693,15 +685,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndReopen) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenAndWriteMore \
FLAKY_WriteIntoNewStorageQueueReopenAndWriteMore
#else
#define MAYBE_WriteIntoNewStorageQueueReopenAndWriteMore \
WriteIntoNewStorageQueueReopenAndWriteMore
#endif
TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueReopenAndWriteMore) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueReopenAndWriteMore) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand All @@ -715,15 +699,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueReopenAndWriteMore) {
WriteStringOrDie(kMoreData[2]);
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueAndUpload \
FLAKY_WriteIntoNewStorageQueueAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueAndUpload \
WriteIntoNewStorageQueueAndUpload
#endif
TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndUpload) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueAndUpload) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand All @@ -746,15 +722,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndUpload) {
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueAndUploadWithFailures \
FLAKY_WriteIntoNewStorageQueueAndUploadWithFailures
#else
#define MAYBE_WriteIntoNewStorageQueueAndUploadWithFailures \
WriteIntoNewStorageQueueAndUploadWithFailures
#endif
TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndUploadWithFailures) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueAndUploadWithFailures) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand All @@ -780,16 +748,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndUploadWithFailures) {
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload \
FLAKY_WriteIntoNewStorageQueueReopenWriteMoreAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload \
WriteIntoNewStorageQueueReopenWriteMoreAndUpload
#endif
TEST_P(StorageQueueTest,
MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndUpload) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueReopenWriteMoreAndUpload) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand Down Expand Up @@ -823,17 +782,8 @@ TEST_P(StorageQueueTest,
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload \
FLAKY_WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload \
WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload
#endif
TEST_P(
StorageQueueTest,
MAYBE_WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload) {
TEST_P(StorageQueueTest,
WriteIntoNewStorageQueueReopenWithMissingMetadataWriteMoreAndUpload) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand Down Expand Up @@ -875,17 +825,9 @@ TEST_P(
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload \
FLAKY_WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload \
WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload
#endif
TEST_P(
StorageQueueTest,
MAYBE_WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload) {
WriteIntoNewStorageQueueReopenWithMissingLastMetadataWriteMoreAndUpload) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand Down Expand Up @@ -940,16 +882,8 @@ TEST_P(
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload \
FLAKY_WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload \
WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload
#endif
TEST_P(StorageQueueTest,
MAYBE_WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload) {
WriteIntoNewStorageQueueReopenWithMissingDataWriteMoreAndUpload) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand Down Expand Up @@ -1035,14 +969,7 @@ TEST_P(StorageQueueTest,
task_environment_.FastForwardBy(base::Seconds(1));
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueAndFlush \
FLAKY_WriteIntoNewStorageQueueAndFlush
#else
#define MAYBE_WriteIntoNewStorageQueueAndFlush WriteIntoNewStorageQueueAndFlush
#endif
TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndFlush) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueAndFlush) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsOnlyManual());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand All @@ -1065,16 +992,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteIntoNewStorageQueueAndFlush) {
storage_queue_->Flush();
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndFlush \
FLAKY_WriteIntoNewStorageQueueReopenWriteMoreAndFlush
#else
#define MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndFlush \
WriteIntoNewStorageQueueReopenWriteMoreAndFlush
#endif
TEST_P(StorageQueueTest,
MAYBE_WriteIntoNewStorageQueueReopenWriteMoreAndFlush) {
TEST_P(StorageQueueTest, WriteIntoNewStorageQueueReopenWriteMoreAndFlush) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsOnlyManual());
WriteStringOrDie(kData[0]);
WriteStringOrDie(kData[1]);
Expand Down Expand Up @@ -1135,15 +1053,7 @@ TEST_P(StorageQueueTest, ValidateVariousRecordSizes) {
storage_queue_->Flush();
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteAndRepeatedlyUploadWithConfirmations \
FLAKY_WriteAndRepeatedlyUploadWithConfirmations
#else
#define MAYBE_WriteAndRepeatedlyUploadWithConfirmations \
WriteAndRepeatedlyUploadWithConfirmations
#endif
TEST_P(StorageQueueTest, MAYBE_WriteAndRepeatedlyUploadWithConfirmations) {
TEST_P(StorageQueueTest, WriteAndRepeatedlyUploadWithConfirmations) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());

WriteStringOrDie(kData[0]);
Expand Down Expand Up @@ -1249,16 +1159,7 @@ TEST_P(StorageQueueTest, MAYBE_WriteAndRepeatedlyUploadWithConfirmations) {
}
}

// TODO(crbug.com/1316604): Flaky on iPad device.
#if BUILDFLAG(IS_IOS)
#define MAYBE_WriteAndRepeatedlyUploadWithConfirmationsAndReopen \
FLAKY_WriteAndRepeatedlyUploadWithConfirmationsAndReopen
#else
#define MAYBE_WriteAndRepeatedlyUploadWithConfirmationsAndReopen \
WriteAndRepeatedlyUploadWithConfirmationsAndReopen
#endif
TEST_P(StorageQueueTest,
MAYBE_WriteAndRepeatedlyUploadWithConfirmationsAndReopen) {
TEST_P(StorageQueueTest, WriteAndRepeatedlyUploadWithConfirmationsAndReopen) {
CreateTestStorageQueueOrDie(BuildStorageQueueOptionsPeriodic());

WriteStringOrDie(kData[0]);
Expand Down

0 comments on commit 072f5ed

Please sign in to comment.