Fix status/string conversion for android json NOTRUN status.

Previously, the if/else block was missing the NOTRUN status. Since the statuses
are already represented by strings, this CL converts the strings to be expected
outputs. This allows us to remove the entire if/else block.

Bug: 895027
Change-Id: Ieb426eb268c30dd07a6642dcfd97122cdb07c926
Reviewed-on: https://chromium-review.googlesource.com/c/1305414Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603562}

build/android/pylib/base/base_test_result.py

@@ -10,13 +10,13 @@ import threading
 class ResultType(object):
   """Class enumerating test types."""
   # The test passed.
-  PASS = 'PASS'
+  PASS = 'SUCCESS'
 
   # The test was intentionally skipped.
-  SKIP = 'SKIP'
+  SKIP = 'SKIPPED'
 
   # The test failed.
-  FAIL = 'FAIL'
+  FAIL = 'FAILURE'
 
   # The test caused the containing process to crash.
   CRASH = 'CRASH'

build/android/pylib/results/json_results.py

@@ -72,20 +72,6 @@ def GenerateResultsDict(test_run_results, global_tags=None):
   #   ],
   # }
 
-  def status_as_string(s):
-    if s == base_test_result.ResultType.PASS:
-      return 'SUCCESS'
-    elif s == base_test_result.ResultType.SKIP:
-      return 'SKIPPED'
-    elif s == base_test_result.ResultType.FAIL:
-      return 'FAILURE'
-    elif s == base_test_result.ResultType.CRASH:
-      return 'CRASH'
-    elif s == base_test_result.ResultType.TIMEOUT:
-      return 'TIMEOUT'
-    elif s == base_test_result.ResultType.UNKNOWN:
-      return 'UNKNOWN'
-
   all_tests = set()
   per_iteration_data = []
   test_run_links = {}
@@ -103,7 +89,7 @@ def GenerateResultsDict(test_run_results, global_tags=None):
 
     for r in results_iterable:
       result_dict = {
-          'status': status_as_string(r.GetType()),
+          'status': r.GetType(),
           'elapsed_time_ms': r.GetDuration(),
           'output_snippet': unicode(r.GetLog(), errors='replace'),
           'losless_snippet': True,
@@ -152,17 +138,8 @@ def ParseResultsFromJson(json_results):
   """
 
   def string_as_status(s):
-    if s == 'SUCCESS':
-      return base_test_result.ResultType.PASS
-    elif s == 'SKIPPED':
-      return base_test_result.ResultType.SKIP
-    elif s == 'FAILURE':
-      return base_test_result.ResultType.FAIL
-    elif s == 'CRASH':
-      return base_test_result.ResultType.CRASH
-    elif s == 'TIMEOUT':
-      return base_test_result.ResultType.TIMEOUT
-    else:
+    if s in base_test_result.ResultType.GetTypes():
+      return s
     return base_test_result.ResultType.UNKNOWN
 
   results_list = []