| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
|
| index 19a232a4e721312af3dd672af95cc42acbc38749..e498dc248687d5cdd84f029c0c2b56f22c92a433 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
|
| @@ -49,6 +49,7 @@ NO_PERMISSION_TOMBSTONE_TEST_TYPE = 2
|
| INVALID_ENTRY_TOMBSTONE_TEST_TYPE = 3
|
| INVALID_ENTRIES_TOMBSTONE_TEST_TYPE = 4
|
|
|
| +
|
| # Any "adb" commands will be interpret by this class instead of executing actual
|
| # commansd on the file system, which we don't want to do.
|
| class MockAndroidDebugBridge:
|
| @@ -103,8 +104,8 @@ class MockAndroidDebugBridge:
|
| # Local private methods.
|
|
|
| def _get_device_output(self):
|
| - serials = ['123456789ABCDEF0', '123456789ABCDEF1', '123456789ABCDEF2',
|
| - '123456789ABCDEF3', '123456789ABCDEF4', '123456789ABCDEF5']
|
| + serials = ['123456789ABCDEF0', '123456789ABCDEF1', '123456789ABCDEF2', '123456789ABCDEF3', '123456789ABCDEF4',
|
| + '123456789ABCDEF5']
|
| output = 'List of devices attached\n'
|
| for serial in serials[:self._device_count]:
|
| output += '%s\tdevice\n' % serial
|
| @@ -204,8 +205,11 @@ class ChromiumAndroidDriverTest(unittest.TestCase):
|
|
|
| android_commands = android.AndroidCommands(self._mock_executive, '123456789ABCDEF0', debug_logging=False)
|
| self._port = android.AndroidPort(MockSystemHost(executive=self._mock_executive), 'android')
|
| - self._driver = android.ChromiumAndroidDriver(self._port, worker_number=0,
|
| - pixel_tests=True, driver_details=android.ContentShellDriverDetails(), android_devices=self._port._devices)
|
| + self._driver = android.ChromiumAndroidDriver(self._port,
|
| + worker_number=0,
|
| + pixel_tests=True,
|
| + driver_details=android.ContentShellDriverDetails(),
|
| + android_devices=self._port._devices)
|
|
|
| # The cmd_line() method in the Android port is used for starting a shell, not the test runner.
|
| def test_cmd_line(self):
|
| @@ -226,10 +230,16 @@ class ChromiumAndroidDriverTwoDriversTest(unittest.TestCase):
|
| mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
|
|
|
| port = android.AndroidPort(MockSystemHost(executive=mock_executive), 'android')
|
| - driver0 = android.ChromiumAndroidDriver(port, worker_number=0, pixel_tests=True,
|
| - driver_details=android.ContentShellDriverDetails(), android_devices=port._devices)
|
| - driver1 = android.ChromiumAndroidDriver(port, worker_number=1, pixel_tests=True,
|
| - driver_details=android.ContentShellDriverDetails(), android_devices=port._devices)
|
| + driver0 = android.ChromiumAndroidDriver(port,
|
| + worker_number=0,
|
| + pixel_tests=True,
|
| + driver_details=android.ContentShellDriverDetails(),
|
| + android_devices=port._devices)
|
| + driver1 = android.ChromiumAndroidDriver(port,
|
| + worker_number=1,
|
| + pixel_tests=True,
|
| + driver_details=android.ContentShellDriverDetails(),
|
| + android_devices=port._devices)
|
|
|
| self.assertEqual(['adb', '-s', '123456789ABCDEF0', 'shell'], driver0.cmd_line(True, []))
|
| self.assertEqual(['adb', '-s', '123456789ABCDEF1', 'shell'], driver1.cmd_line(True, ['anything']))
|
| @@ -241,10 +251,14 @@ class ChromiumAndroidTwoPortsTest(unittest.TestCase):
|
| mock_adb = MockAndroidDebugBridge(2)
|
| mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
|
|
|
| - port0 = android.AndroidPort(MockSystemHost(executive=mock_executive),
|
| - 'android', options=MockOptions(additional_driver_flag=['--foo=bar']))
|
| - port1 = android.AndroidPort(MockSystemHost(executive=mock_executive),
|
| - 'android', options=MockOptions(driver_name='content_shell'))
|
| + port0 = android.AndroidPort(
|
| + MockSystemHost(executive=mock_executive),
|
| + 'android',
|
| + options=MockOptions(additional_driver_flag=['--foo=bar']))
|
| + port1 = android.AndroidPort(
|
| + MockSystemHost(executive=mock_executive),
|
| + 'android',
|
| + options=MockOptions(driver_name='content_shell'))
|
|
|
| self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar'))
|
| self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo'))
|
| @@ -258,8 +272,11 @@ class ChromiumAndroidDriverTombstoneTest(unittest.TestCase):
|
| self._mock_executive = MockExecutive2(run_command_fn=self._mock_adb.run_command)
|
|
|
| self._port = android.AndroidPort(MockSystemHost(executive=self._mock_executive), 'android')
|
| - self._driver = android.ChromiumAndroidDriver(self._port, worker_number=0,
|
| - pixel_tests=True, driver_details=android.ContentShellDriverDetails(), android_devices=self._port._devices)
|
| + self._driver = android.ChromiumAndroidDriver(self._port,
|
| + worker_number=0,
|
| + pixel_tests=True,
|
| + driver_details=android.ContentShellDriverDetails(),
|
| + android_devices=self._port._devices)
|
|
|
| self._errors = []
|
| self._driver._log_error = lambda msg: self._errors.append(msg)
|
| @@ -287,8 +304,7 @@ class ChromiumAndroidDriverTombstoneTest(unittest.TestCase):
|
|
|
| # Tests that invalid "ls" output will throw a warning when listing the tombstone files.
|
| def test_invalid_tombstone_list_entry_format(self):
|
| - self._mock_adb.set_tombstone_output('-rw------- 1000 1000 3604 2013-11-19 16:15 tombstone_00\n' +
|
| - '-- invalid entry --\n' +
|
| + self._mock_adb.set_tombstone_output('-rw------- 1000 1000 3604 2013-11-19 16:15 tombstone_00\n' + '-- invalid entry --\n' +
|
| '-rw------- 1000 1000 3604 2013-11-19 16:16 tombstone_10')
|
| stacktrace = self._driver._get_last_stacktrace()
|
|
|
|
|