| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 import optparse | 29 import optparse |
| 30 import StringIO | 30 import StringIO |
| 31 import time | 31 import time |
| 32 import unittest2 as unittest | 32 from webkitpy.thirdparty import unittest2 as unittest |
| 33 import sys | 33 import sys |
| 34 | 34 |
| 35 from webkitpy.common.system import executive_mock | 35 from webkitpy.common.system import executive_mock |
| 36 from webkitpy.common.system.executive_mock import MockExecutive2 | 36 from webkitpy.common.system.executive_mock import MockExecutive2 |
| 37 from webkitpy.common.system.systemhost_mock import MockSystemHost | 37 from webkitpy.common.system.systemhost_mock import MockSystemHost |
| 38 | 38 |
| 39 from webkitpy.layout_tests.port import android | 39 from webkitpy.layout_tests.port import android |
| 40 from webkitpy.layout_tests.port import chromium_port_testcase | 40 from webkitpy.layout_tests.port import chromium_port_testcase |
| 41 from webkitpy.layout_tests.port import driver | 41 from webkitpy.layout_tests.port import driver |
| 42 from webkitpy.layout_tests.port import driver_unittest | 42 from webkitpy.layout_tests.port import driver_unittest |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 mock_adb = MockAndroidDebugBridge(2) | 211 mock_adb = MockAndroidDebugBridge(2) |
| 212 mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command) | 212 mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command) |
| 213 | 213 |
| 214 port0 = android.AndroidPort(MockSystemHost(executive=mock_executive), | 214 port0 = android.AndroidPort(MockSystemHost(executive=mock_executive), |
| 215 'android', options=MockOptions(additional_drt_flag=['--foo=bar'])) | 215 'android', options=MockOptions(additional_drt_flag=['--foo=bar'])) |
| 216 port1 = android.AndroidPort(MockSystemHost(executive=mock_executive), | 216 port1 = android.AndroidPort(MockSystemHost(executive=mock_executive), |
| 217 'android', options=MockOptions(driver_name='content_shell')) | 217 'android', options=MockOptions(driver_name='content_shell')) |
| 218 | 218 |
| 219 self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar')) | 219 self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar')) |
| 220 self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo')
) | 220 self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo')
) |
| OLD | NEW |