diff options
| author | Rakib M. Hasan <rmhasan@google.com> | 2023-03-16 20:50:55 +0000 |
|---|---|---|
| committer | Rakib M. Hasan <rmhasan@google.com> | 2023-03-16 21:43:46 +0000 |
| commit | c069561a6ed27e1d279e56eef05b623f9aa9dae8 (patch) | |
| tree | 3fa0bb57fdf0138a5d78eebcf50cb9e353a1775d | |
| parent | 16ccf831e698d0566101c23d72526ba1b0df137e (diff) | |
| download | csuite-c069561a6ed27e1d279e56eef05b623f9aa9dae8.tar.gz | |
Webview: Use only one RunUtil instance in initialization
This CL updates the setUp method of the WebviewInstallerToolPreparer
so that it only uses one RunUtil instance. This will allow us
to set the home directory for the gcloud sdk.
Test: csuite-tradefed run webview-app-launch <params>
Bug: 206871132
Change-Id: I562d181aecdf1f73b0fd8a88a15e5f7661301a6f
| -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 8cc82f2..0863ccf 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 @@ -136,16 +136,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", @@ -158,7 +157,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() @@ -169,31 +168,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", |