diff options
| author | Rakib Hasan <rmhasan@google.com> | 2023-03-22 19:20:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-22 19:20:47 +0000 |
| commit | 3ff52b75a81cede6f897efbbd50fa5d7d5147b88 (patch) | |
| tree | 11a9174a8e07815e3db4bbf5c9f71ad49e85d324 | |
| parent | 4ec83ec4e0c2d0ed3fc6733e8b7ad03e6d4b9d21 (diff) | |
| parent | 9d9dfc3597fa029a957224725a6b0842dad397a0 (diff) | |
| download | csuite-3ff52b75a81cede6f897efbbd50fa5d7d5147b88.tar.gz | |
Merge "Webview: Use only one RunUtil instance in initialization" am: 1cf79c29a2 am: 2740a512f8 am: 9d9dfc3597
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/2495037
Change-Id: I9ca16716cf12730e42ccfaf29d33e41050aed3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | test_scripts/src/main/java/com/android/webview/lib/WebviewInstallerToolPreparer.java | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/test_scripts/src/main/java/com/android/webview/lib/WebviewInstallerToolPreparer.java b/test_scripts/src/main/java/com/android/webview/lib/WebviewInstallerToolPreparer.java index 349cd78..52e5c94 100644 --- a/test_scripts/src/main/java/com/android/webview/lib/WebviewInstallerToolPreparer.java +++ b/test_scripts/src/main/java/com/android/webview/lib/WebviewInstallerToolPreparer.java @@ -134,16 +134,15 @@ public class WebviewInstallerToolPreparer implements ITargetPreparer { Assert.assertNotEquals( "Argument --gcloud-cli-zip must be used.", mGcloudCliZipArchive, null); try { + RunUtil runUtil = mRunUtilProvider.get(); mGcloudCliDir = Files.createTempDirectory(null).toFile(); CommandResult unzipRes = - mRunUtilProvider - .get() - .runTimedCmd( - COMMAND_TIMEOUT_MILLIS, - "unzip", - mGcloudCliZipArchive.getAbsolutePath(), - "-d", - mGcloudCliDir.getAbsolutePath()); + runUtil.runTimedCmd( + COMMAND_TIMEOUT_MILLIS, + "unzip", + mGcloudCliZipArchive.getAbsolutePath(), + "-d", + mGcloudCliDir.getAbsolutePath()); Assert.assertEquals( "Unable to unzip the gcloud cli zip archive", @@ -156,7 +155,7 @@ public class WebviewInstallerToolPreparer implements ITargetPreparer { // gcloud and gsutil executables tracked by this class by setting the home // directory for processes that run those executables to a temporary directory // also tracked by this class. - mRunUtilProvider.get().setEnvVariable("HOME", mGcloudCliDir.getAbsolutePath()); + runUtil.setEnvVariable("HOME", mGcloudCliDir.getAbsolutePath()); File gcloudBin = mGcloudCliDir .toPath() @@ -167,31 +166,27 @@ public class WebviewInstallerToolPreparer implements ITargetPreparer { "printf \"1\\n1\" | %s init --console-only", gcloudBin.getAbsolutePath()); CommandResult gcloudInitRes = - mRunUtilProvider - .get() - .runTimedCmd( - COMMAND_TIMEOUT_MILLIS, - System.out, - System.out, - "sh", - "-c", - gcloudInitScript); + runUtil.runTimedCmd( + COMMAND_TIMEOUT_MILLIS, + System.out, + System.out, + "sh", + "-c", + gcloudInitScript); Assert.assertEquals( "gcloud cli initialization failed", gcloudInitRes.getStatus(), CommandStatus.SUCCESS); CommandResult chmodRes = - mRunUtilProvider - .get() - .runTimedCmd( - COMMAND_TIMEOUT_MILLIS, - System.out, - System.out, - "chmod", - "755", - "-v", - mWebviewInstallerTool.getAbsolutePath()); + runUtil.runTimedCmd( + COMMAND_TIMEOUT_MILLIS, + System.out, + System.out, + "chmod", + "755", + "-v", + mWebviewInstallerTool.getAbsolutePath()); Assert.assertEquals( "The 'chmod 755 -v <WebView installer tool>' command failed", |