commit faf75e9565c213b68d12b5bb603cc94827f37cd4
author Gurchetan Singh <gurchetansingh@google.com> Mon Apr 17 18:09:44 2017 -0700
committer Ilja H. Friedel <ihf@chromium.org> Wed Apr 19 20:23:23 2017 +0000
tree 54c4adcf06f66946113ce61a78cdc2e4911d854d
parent c5289fbf3af062deb4fc295ddea23a6fba60b382

telemetry: make telemetry_GpuTests run again

run_gpu_test.py was removed with crrev.com/2618983004. Additionally,
the wrapper to run_gpu_test.py was removed with CL:331795. We need
to create a new wrapper to the new script (run_gpu_integration_test.py).

BUG=chromium:712201
TEST=test_that --args='local=True' $IP telemetry_GpuTests.screenshot_sync
     succeeds on Kevin

Change-Id: Id1ec31078f613cae848ca1dcf374cae41f4f60d5
Reviewed-on: https://chromium-review.googlesource.com/479470
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>

server/cros/telemetry_runner.py

diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py
index 6586993..c78bb94 100644
--- a/server/cros/telemetry_runner.py
+++ b/server/cros/telemetry_runner.py
@@ -12,6 +12,7 @@
 
 TELEMETRY_RUN_BENCHMARKS_SCRIPT = 'tools/perf/run_benchmark'
 TELEMETRY_RUN_TESTS_SCRIPT = 'tools/telemetry/run_tests'
+TELEMETRY_RUN_GPU_TESTS_SCRIPT = 'content/test/gpu/run_gpu_integration_test.py'
 TELEMETRY_TIMEOUT_MINS = 120
 
 DUT_CHROME_ROOT = '/usr/local/telemetry/src'
@@ -402,6 +403,40 @@
             self._run_scp(perf_value_writer.resultsdir)
         return result
 
+
+    def run_gpu_integration_test(self, test, *args):
+        """Runs a gpu test on a dut.
+
+        @param test: Gpu test we want to run.
+        @param args: additional list of arguments to pass to the telemetry
+                     execution script.
+
+         @returns A TelemetryResult instance with the results of this telemetry
+                  execution.
+        """
+        script = os.path.join(DUT_CHROME_ROOT,
+                              TELEMETRY_RUN_GPU_TESTS_SCRIPT)
+        cmd = []
+        if self._devserver:
+            devserver_hostname = self._devserver.hostname
+            cmd.extend(['ssh', devserver_hostname])
+
+        cmd.extend(
+                ['ssh',
+                 DUT_SSH_OPTIONS,
+                 self._host.hostname,
+                 'python',
+                 script])
+
+        cmd.extend(args)
+        cmd.append(test)
+        cmd = ' '.join(cmd)
+        stdout, stderr, exit_code = self._run_cmd(cmd)
+
+        return TelemetryResult(exit_code=exit_code, stdout=stdout,
+                               stderr=stderr)
+
+
     def _ensure_deps(self, dut, test_name):
         """
         Ensure the dependencies are locally available on DUT.

server/site_tests/telemetry_GpuTests/telemetry_GpuTests.py

diff --git a/server/site_tests/telemetry_GpuTests/telemetry_GpuTests.py b/server/site_tests/telemetry_GpuTests/telemetry_GpuTests.py
index 70809f4..1ff6b25 100644
--- a/server/site_tests/telemetry_GpuTests/telemetry_GpuTests.py
+++ b/server/site_tests/telemetry_GpuTests/telemetry_GpuTests.py
@@ -21,6 +21,6 @@
         """
         local = args.get("local") == "True"
         telemetry = telemetry_runner.TelemetryRunner(host, local)
-        result = telemetry.run_gpu_test(test)
+        result = telemetry.run_gpu_integration_test(test)
         logging.debug('Telemetry completed with a status of: %s with output:'
                       ' %s', result.status, result.output)