Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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 752e4d3d0e4fee769a2f70e9efc1fa7776eef76d..693f17505fcc61d188dd216d0d67b5d40939a2e1 100755
--- a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
@@ -27,12 +27,15 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
     options = mock.Mock()
     options.tool = ''
 
-  def testGenerateTestResults_noStatus(self):
-    results = instrumentation_test_instance.GenerateTestResults(
-        None, None, [], 0, 1000)
-    self.assertEqual([], results)
-
-  def testGenerateTestResults_testPassed(self):
+  def testGenerateTestResult_noStatus(self):
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', [], 0, 1000)
+    self.assertEqual('test.package.TestClass#testMethod', result.GetName())
+    self.assertEqual(base_test_result.ResultType.UNKNOWN, result.GetType())
+    self.assertEqual('', result.GetLog())
+    self.assertEqual(1000, result.GetDuration())
+
+  def testGenerateTestResult_testPassed(self):
     statuses = [
       (1, {
         'class': 'test.package.TestClass',
@@ -43,19 +46,16 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
         'test': 'testMethod',
       }),
     ]
-    results = instrumentation_test_instance.GenerateTestResults(
-        None, None, statuses, 0, 1000)
-    self.assertEqual(1, len(results))
-    self.assertEqual(base_test_result.ResultType.PASS, results[0].GetType())
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', statuses, 0, 1000)
+    self.assertEqual(base_test_result.ResultType.PASS, result.GetType())
 
-  def testGenerateTestResults_testSkipped_true(self):
+  def testGenerateTestResult_testSkipped_first(self):
     statuses = [
-      (1, {
-        'class': 'test.package.TestClass',
-        'test': 'testMethod',
-      }),
       (0, {
         'test_skipped': 'true',
+      }),
+      (1, {
         'class': 'test.package.TestClass',
         'test': 'testMethod',
       }),
@@ -64,31 +64,47 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
         'test': 'testMethod',
       }),
     ]
-    results = instrumentation_test_instance.GenerateTestResults(
-        None, None, statuses, 0, 1000)
-    self.assertEqual(1, len(results))
-    self.assertEqual(base_test_result.ResultType.SKIP, results[0].GetType())
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', statuses, 0, 1000)
+    self.assertEqual(base_test_result.ResultType.SKIP, result.GetType())
 
-  def testGenerateTestResults_testSkipped_false(self):
+  def testGenerateTestResult_testSkipped_last(self):
     statuses = [
       (1, {
         'class': 'test.package.TestClass',
         'test': 'testMethod',
       }),
       (0, {
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
+      }),
+      (0, {
+        'test_skipped': 'true',
+      }),
+    ]
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', statuses, 0, 1000)
+    self.assertEqual(base_test_result.ResultType.SKIP, result.GetType())
+
+  def testGenerateTestResult_testSkipped_false(self):
+    statuses = [
+      (0, {
         'test_skipped': 'false',
       }),
+      (1, {
+        'class': 'test.package.TestClass',
+        'test': 'testMethod',
+      }),
       (0, {
         'class': 'test.package.TestClass',
         'test': 'testMethod',
       }),
     ]
-    results = instrumentation_test_instance.GenerateTestResults(
-        None, None, statuses, 0, 1000)
-    self.assertEqual(1, len(results))
-    self.assertEqual(base_test_result.ResultType.PASS, results[0].GetType())
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', statuses, 0, 1000)
+    self.assertEqual(base_test_result.ResultType.PASS, result.GetType())
 
-  def testGenerateTestResults_testFailed(self):
+  def testGenerateTestResult_testFailed(self):
     statuses = [
       (1, {
         'class': 'test.package.TestClass',
@@ -99,10 +115,9 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
         'test': 'testMethod',
       }),
     ]
-    results = instrumentation_test_instance.GenerateTestResults(
-        None, None, statuses, 0, 1000)
-    self.assertEqual(1, len(results))
-    self.assertEqual(base_test_result.ResultType.FAIL, results[0].GetType())
+    result = instrumentation_test_instance.GenerateTestResult(
+        'test.package.TestClass#testMethod', statuses, 0, 1000)
+    self.assertEqual(base_test_result.ResultType.FAIL, result.GetType())
 
 
 if __name__ == '__main__':