Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Tools / Scripts / webkitpy / layout_tests / port / android_unittest.py

diff --git a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
index 01761c7..9a2fd61 100644 (file)
--- a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
+++ b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
@@ -26,11 +26,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import optparse
 import StringIO
-import time
-import webkitpy.thirdparty.unittest2 as unittest
+import optparse
 import sys
+import time
+import unittest
 
 from webkitpy.common.system import executive_mock
 from webkitpy.common.system.executive_mock import MockExecutive2
@@ -123,13 +123,6 @@ class AndroidCommandsTest(unittest.TestCase):
     def make_android_commands(self, device_count, serial):
         return android.AndroidCommands(self.make_executive(device_count), serial, debug_logging=False)
 
-    # The "adb" binary with the latest version should be used.
-    def serial_test_adb_command_path(self):
-        executive = self.make_executive(0)
-
-        android.AndroidCommands.set_adb_command_path_options(['path1', 'path2', 'path3'])
-        self.assertEqual('path2', android.AndroidCommands.adb_command_path(executive, debug_logging=False))
-
     # The used adb command should include the device's serial number, and get_serial() should reflect this.
     def test_adb_command_and_get_serial(self):
         android_commands = self.make_android_commands(1, '123456789ABCDEF0')