diff options
| author | Stas Negara <snegara@google.com> | 2015-07-28 13:26:05 -0700 |
|---|---|---|
| committer | Stas Negara <snegara@google.com> | 2015-07-28 13:26:05 -0700 |
| commit | 95e24bc963882eaf92a2c6c375efdbdc33555b92 (patch) | |
| tree | acb8e7d3be08e12b37116479d1f32c0400495116 | |
| parent | c6bb53ee21a29a46e22163874f89a4ef0f1a2a18 (diff) | |
| download | testing-95e24bc963882eaf92a2c6c375efdbdc33555b92.tar.gz | |
Initial usage of TightVNC in cloud testing plugin.
Also, pass the configuration name to Tight VNC Viewer.
Change-Id: I07bfe2458802e467511ade74ee5aad85a38dcec1
| -rw-r--r-- | google-cloud-testing.iml | 3 | ||||
| -rw-r--r-- | src/com/google/gct/testing/CloudConfigurationProviderImpl.java | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/google-cloud-testing.iml b/google-cloud-testing.iml index bf67573..d21bcd8 100644 --- a/google-cloud-testing.iml +++ b/google-cloud-testing.iml @@ -60,5 +60,6 @@ </orderEntry> <orderEntry type="module" module-name="google-cloud-tools-core-as" /> <orderEntry type="module" module-name="google-login-as" /> + <orderEntry type="library" name="tightvnc" level="project" /> </component> -</module> +</module>
\ No newline at end of file diff --git a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java index a64f2d5..734f2bf 100644 --- a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java +++ b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java @@ -24,8 +24,8 @@ import com.android.tools.idea.run.CloudConfiguration; import com.android.tools.idea.run.CloudConfiguration.Kind; import com.android.tools.idea.run.CloudConfigurationProvider; import com.android.tools.idea.sdk.IdeSdks; -//import com.glavsoft.viewer.Viewer; import com.android.tools.idea.stats.UsageTracker; +import com.glavsoft.viewer.Viewer; import com.google.api.client.util.Maps; import com.google.api.client.util.Sets; import com.google.api.services.storage.Storage; @@ -340,6 +340,8 @@ public class CloudConfigurationProviderImpl extends CloudConfigurationProvider { synchronized (ghostCloudDevices) { ghostCloudDevices.add(ghostCloudDevice); } + String configurationName = + ConfigurationInstance.parseFromEncodedString(ghostCloudDevice.getEncodedConfigurationInstance()).getResultsViewerDisplayString(); final long POLLING_INTERVAL = 10 * 1000; // 10 seconds final long INITIAL_TIMEOUT = 10 * 60 * 1000; // 10 minutes long stopTime = System.currentTimeMillis() + INITIAL_TIMEOUT; @@ -379,8 +381,8 @@ public class CloudConfigurationProviderImpl extends CloudConfigurationProvider { Process unlock = rt.exec("./adb -s " + deviceAddress + " wait-for-device shell input keyevent 82" , null, dir); unlock.waitFor(); // Open the VNC window for the cloud device. - //String[] viewerArgs = new String[]{"-port=" + vncPort, "-host=" + ipAddress, "-password=" + vncPassword, "-fullScreen=false"}; - //Viewer.main(viewerArgs); + String[] viewerArgs = new String[]{"-port=" + vncPort, "-host=" + ipAddress, "-password=" + vncPassword, "-fullScreen=false"}; + Viewer.showViewer(viewerArgs, configurationName); return; } Thread.sleep(POLLING_INTERVAL); |