diff options
| author | Paul Trautrim <paultrautrim@google.com> | 2019-06-21 18:02:47 +0900 |
|---|---|---|
| committer | Paul Trautrim <paultrautrim@google.com> | 2019-07-01 13:01:43 +0900 |
| commit | 31ca2a9dd01031c7712ea63dd94d899b28283f17 (patch) | |
| tree | 152a235d97f085cb50ce2de4c3b0987f69a33cb7 /tests | |
| parent | 824f5ab2def73551f105632b70f9164055ab024b (diff) | |
| download | gsid-31ca2a9dd01031c7712ea63dd94d899b28283f17.tar.gz | |
Fix issues with DSU test when run from test infra
Bug: 129514256
Test: manual
Change-Id: I23e88ef6ab917d3e14ac8011eec89db9bba0a5a8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.bp | 3 | ||||
| -rw-r--r-- | tests/DSUEndtoEndTest.java | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index cb4ae49..8ddd0d2 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -50,5 +50,6 @@ android_test { libs: ["junit", "android.test.base.stubs"], static_libs: ["androidx.test.uiautomator"], certificate: "platform", - manifest: "AndroidManifest.xml" + manifest: "AndroidManifest.xml", + test_suites: ["general-tests"], } diff --git a/tests/DSUEndtoEndTest.java b/tests/DSUEndtoEndTest.java index a0580aa..175ca54 100644 --- a/tests/DSUEndtoEndTest.java +++ b/tests/DSUEndtoEndTest.java @@ -76,13 +76,13 @@ public class DSUEndtoEndTest extends BaseHostJUnit4Test { public void testDSU() throws Exception { String simg2imgPath = "simg2img"; if (mSystemImagePath == null) { - IDeviceBuildInfo deviceBuild = (IDeviceBuildInfo) getBuild(); - File system = deviceBuild.getDeviceImageFile(); + IBuildInfo buildInfo = getBuild(); + File system = ((IDeviceBuildInfo) buildInfo).getDeviceImageFile(); Assert.assertNotEquals("Failed to fetch system image. See system_image_path parameter", null, system); - mSystemImagePath = system.getAbsolutePath(); - File otaPackage = deviceBuild.getOtaPackageFile(); - File simg2img = ZipUtil2.extractFileFromZip(new ZipFile(otaPackage), SIMG2IMG_PATH); - simg2imgPath = simg2img.getAbsolutePath(); + mSystemImagePath = ZipUtil2.extractFileFromZip(new ZipFile(system), "system.img").getAbsolutePath(); + File otaTools = buildInfo.getFile("otatools.zip"); + File tempdir = ZipUtil2.extractZipToTemp(otaTools, "otatools"); + simg2imgPath = new File(tempdir, SIMG2IMG_PATH).getAbsolutePath(); } File gsi = new File(mSystemImagePath); Assert.assertTrue("not a valid file", gsi.isFile()); |