Update from https://crrev.com/316786

build/android/pylib/instrumentation/instrumentation_test_instance_test.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance_test.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
index 3bf39399391580cc07d4b35eda2b3ae858224a53..693f17505fcc61d188dd216d0d67b5d40939a2e1 100755
--- a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
@@ -27,115 +27,6 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
     options = mock.Mock()
     options.tool = ''
 
-  def testParseAmInstrumentRawOutput_nothing(self):
-    code, result, statuses = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(['']))
-    self.assertEqual(None, code)
-    self.assertEqual([], result)
-    self.assertEqual([], statuses)
-
-  def testParseAmInstrumentRawOutput_noMatchingStarts(self):
-    raw_output = [
-      '',
-      'this.is.a.test.package.TestClass:.',
-      'Test result for =.',
-      'Time: 1.234',
-      '',
-      'OK (1 test)',
-    ]
-
-    code, result, statuses = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))
-    self.assertEqual(None, code)
-    self.assertEqual([], result)
-    self.assertEqual([], statuses)
-
-  def testParseAmInstrumentRawOutput_resultAndCode(self):
-    raw_output = [
-      'INSTRUMENTATION_RESULT: foo',
-      'bar',
-      'INSTRUMENTATION_CODE: -1',
-    ]
-
-    code, result, _ = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))
-    self.assertEqual(-1, code)
-    self.assertEqual(['foo', 'bar'], result)
-
-  def testParseAmInstrumentRawOutput_oneStatus(self):
-    raw_output = [
-      'INSTRUMENTATION_STATUS: foo=1',
-      'INSTRUMENTATION_STATUS: bar=hello',
-      'INSTRUMENTATION_STATUS: world=false',
-      'INSTRUMENTATION_STATUS: class=this.is.a.test.package.TestClass',
-      'INSTRUMENTATION_STATUS: test=testMethod',
-      'INSTRUMENTATION_STATUS_CODE: 0',
-    ]
-
-    _, _, statuses = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))
-
-    expected = [
-      (0, {
-        'foo': ['1'],
-        'bar': ['hello'],
-        'world': ['false'],
-        'class': ['this.is.a.test.package.TestClass'],
-        'test': ['testMethod'],
-      })
-    ]
-    self.assertEqual(expected, statuses)
-
-  def testParseAmInstrumentRawOutput_multiStatus(self):
-    raw_output = [
-      'INSTRUMENTATION_STATUS: class=foo',
-      'INSTRUMENTATION_STATUS: test=bar',
-      'INSTRUMENTATION_STATUS_CODE: 1',
-      'INSTRUMENTATION_STATUS: test_skipped=true',
-      'INSTRUMENTATION_STATUS_CODE: 0',
-      'INSTRUMENTATION_STATUS: class=hello',
-      'INSTRUMENTATION_STATUS: test=world',
-      'INSTRUMENTATION_STATUS: stack=',
-      'foo/bar.py (27)',
-      'hello/world.py (42)',
-      'test/file.py (1)',
-      'INSTRUMENTATION_STATUS_CODE: -1',
-    ]
-
-    _, _, statuses = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))
-
-    expected = [
-      (1, {'class': ['foo'], 'test': ['bar'],}),
-      (0, {'test_skipped': ['true']}),
-      (-1, {
-        'class': ['hello'],
-        'test': ['world'],
-        'stack': ['', 'foo/bar.py (27)', 'hello/world.py (42)',
-                  'test/file.py (1)'],
-      }),
-    ]
-    self.assertEqual(expected, statuses)
-
-  def testParseAmInstrumentRawOutput_statusResultAndCode(self):
-    raw_output = [
-      'INSTRUMENTATION_STATUS: class=foo',
-      'INSTRUMENTATION_STATUS: test=bar',
-      'INSTRUMENTATION_STATUS_CODE: 1',
-      'INSTRUMENTATION_RESULT: hello',
-      'world',
-      '',
-      '',
-      'INSTRUMENTATION_CODE: 0',
-    ]
-
-    code, result, statuses = (
-        instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))
-
-    self.assertEqual(0, code)
-    self.assertEqual(['hello', 'world', '', ''], result)
-    self.assertEqual([(1, {'class': ['foo'], 'test': ['bar']})], statuses)
-
   def testGenerateTestResult_noStatus(self):
     result = instrumentation_test_instance.GenerateTestResult(
         'test.package.TestClass#testMethod', [], 0, 1000)
@@ -147,12 +38,12 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
   def testGenerateTestResult_testPassed(self):
     statuses = [
       (1, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (0, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
     ]
     result = instrumentation_test_instance.GenerateTestResult(
@@ -162,15 +53,15 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
   def testGenerateTestResult_testSkipped_first(self):
     statuses = [
       (0, {
-        'test_skipped': ['true'],
+        'test_skipped': 'true',
       }),
       (1, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (0, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
     ]
     result = instrumentation_test_instance.GenerateTestResult(
@@ -180,15 +71,15 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
   def testGenerateTestResult_testSkipped_last(self):
     statuses = [
       (1, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (0, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (0, {
-        'test_skipped': ['true'],
+        'test_skipped': 'true',
       }),
     ]
     result = instrumentation_test_instance.GenerateTestResult(
@@ -198,15 +89,15 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
   def testGenerateTestResult_testSkipped_false(self):
     statuses = [
       (0, {
-        'test_skipped': ['false'],
+        'test_skipped': 'false',
       }),
       (1, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (0, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
     ]
     result = instrumentation_test_instance.GenerateTestResult(
@@ -216,12 +107,12 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
   def testGenerateTestResult_testFailed(self):
     statuses = [
       (1, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
       (-2, {
-        'class': ['test.package.TestClass'],
-        'test': ['testMethod'],
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
       }),
     ]
     result = instrumentation_test_instance.GenerateTestResult(