| 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 c7f609ca84e533b0fc4b358a95081e1d2aa1c4d3..10fe95c738e0cd67431c204a47106b7724582cfe 100755
|
| --- a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
|
| +++ b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
|
| @@ -187,7 +187,6 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
|
|
|
| self.assertEquals(actual_tests, expected_tests)
|
|
|
| - @unittest.skip('crbug.com/623047')
|
| def testGetTests_negativeGtestFilter(self):
|
| o = self.createTestInstance()
|
| raw_tests = [
|
| @@ -217,9 +216,6 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
|
| }
|
| ]
|
|
|
| - o._GetTestsFromPickle = mock.MagicMock(return_value=raw_tests)
|
| - o._test_filter = '*-org.chromium.test.SampleTest.testMethod1'
|
| - o._test_jar = 'path/to/test.jar'
|
| expected_tests = [
|
| {
|
| 'annotations': {
|
| @@ -239,7 +235,12 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
|
| },
|
| ]
|
|
|
| - actual_tests = o.GetTests()
|
| + o._test_filter = '*-org.chromium.test.SampleTest.testMethod1'
|
| + o._test_jar = 'path/to/test.jar'
|
| + with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
|
| + return_value=raw_tests):
|
| + actual_tests = o.GetTests()
|
| +
|
| self.assertEquals(actual_tests, expected_tests)
|
|
|
| def testGetTests_annotationFilter(self):
|
|
|