commit c9b15781a3a01122ae9b36ec515cc73d837d459e
author Tri Vo <trong@google.com> Tue Feb 28 23:17:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 28 23:17:15 2017 +0000
tree 61368a1131c03f115e880c8f5a89d0fac7be46e4
parent 07b2cf898be34abde1af796fd753208c339da037
parent 9c58512bf9a42aa9fa26ca76d6b7f533fb753232

distinguish between skip and fail for poc tests.
am: 9c58512bf9

Change-Id: Ib981ab59623e0b1e94a2fe3923f0f3b1d3157548

poc/host/SecurityPoCKernelTest.py

diff --git a/poc/host/SecurityPoCKernelTest.py b/poc/host/SecurityPoCKernelTest.py
index f9856f2..f92c626 100644
--- a/poc/host/SecurityPoCKernelTest.py
+++ b/poc/host/SecurityPoCKernelTest.py
@@ -24,6 +24,7 @@
 from vts.runners.host import const
 from vts.runners.host import keys
 from vts.runners.host import test_runner
+from vts.utils.python.controllers import adb
 from vts.utils.python.controllers import android_device
 
 from vts.testcases.security.poc.host import poc_test_config as config
@@ -124,7 +125,19 @@
             os.path.join(config.POC_TEST_DIR, testcase),
             self._test_flags)
         logging.info("Executing: %s", test_cmd)
-        result = self._dut.adb.shell("'%s'" % test_cmd)
+        try:
+            stdout = self._dut.adb.shell("'%s'" % test_cmd)
+            result = {
+                const.STDOUT: stdout,
+                const.STDERR: "",
+                const.EXIT_CODE: 0
+            }
+        except adb.AdbError as e:
+            result = {
+                const.STDOUT: e.stdout,
+                const.STDERR: e.stderr,
+                const.EXIT_CODE: e.ret_code
+            }
 
         self.AssertTestResult(result)
 
@@ -136,11 +149,15 @@
         returned exit code 0.
 
         Args:
-            result: string, stdout from test execution.
+            result: dict(str, str, int), stdout, stderr and return code
+                from test run.
         """
-        # TODO(trong): distinguish between fail and skip. See b/33250197.
         if self._dut.hasBooted():
-            asserts.explicitPass("Test case passed.")
+            exit_code = result[const.EXIT_CODE]
+            asserts.skipIf(exit_code == config.ExitCode.POC_TEST_SKIP,
+                    "Test case was skipped.")
+            asserts.assertFalse(exit_code == config.ExitCode.POC_TEST_FAIL,
+                    "Test case failed.")
         else:
             self._dut.waitForBootCompletion()
             self._dut.rootAdb()