diff options
| author | Julien Desprez <jdesprez@google.com> | 2019-10-03 12:53:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-03 12:53:04 -0700 |
| commit | 4f0c3b05a8b525d34cdf34fdf8b74e70308cd624 (patch) | |
| tree | b48d751b67b4de149fe4d6448b81521e8e465497 | |
| parent | dc8ba0b4955503a8f1b418e3e9b55d5989c239e0 (diff) | |
| parent | d8928334c61c3f6a4f0c488b9511eb303c140562 (diff) | |
| download | tradefederation-4f0c3b05a8b525d34cdf34fdf8b74e70308cd624.tar.gz | |
Merge "Merge "Amend testCompress for newer JVM" into oreo-cts-dev am: 265656c5e1" into oreo-mr1-cts-dev
am: d8928334c6
Change-Id: I098e4bdc89db043bc3ea8888f0b325347576db75
| -rw-r--r-- | tests/src/com/android/tradefed/device/TestDeviceTest.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/src/com/android/tradefed/device/TestDeviceTest.java b/tests/src/com/android/tradefed/device/TestDeviceTest.java index cf49cb134..4dbd97b74 100644 --- a/tests/src/com/android/tradefed/device/TestDeviceTest.java +++ b/tests/src/com/android/tradefed/device/TestDeviceTest.java @@ -3431,7 +3431,13 @@ public class TestDeviceTest extends TestCase { Assert.assertEquals(3000, testImage.data.length); result = mTestDevice.compressRawImage(testImage, "JPEG", true); // Size after compressing as JPEG - Assert.assertEquals(1041, result.length); + if (result.length != 1041 && result.length != 851) { + fail( + String.format( + "Should have compress the length as expected, got %s, " + + "expected 851 or 1041", + result.length)); + } } finally { if (testImage != null) { testImage.data = null; |