| commit | 931e69591b1c6d42531fd3f6d7fe7223171c0bce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 18 09:24:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 18 09:24:24 2023 +0000 |
| tree | 3b101f81896935e85436dbddd0935d1c7bd7f3d8 | |
| parent | e8eb2cdec07e018916c092e29cbf3c1ce85282b6 [diff] | |
| parent | a0df991d40f3e25fc3ca980f9037a1e05dff8d14 [diff] |
Merge "TranscodingSessionControllerTest: Allow extra time to receive onError" am: e9bd2c8450 am: df58778f13 am: a0df991d40 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2382005 Change-Id: I3befc51200b4eed28c83adce8a9f1db167b3eba7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp b/media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp index ef9c4f8..fdd327f 100644 --- a/media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp +++ b/media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp
@@ -337,6 +337,8 @@ // Should have created new transcoder. EXPECT_EQ(mTranscoder->getGeneration(), generation); EXPECT_EQ(mTranscoder.use_count(), 2); + // b/240537336: Allow extra time to finish onError call + sleep(1); } void testPacerHelper(int numSubmits, int sessionDurationMs, int expectedSuccess) {