Only consider Android devices with more than 30% battery remaining for layout tests

Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 50 matching lines @@
 
             return 'version 1.0'
 
         if args[0] == 'adb':
             if len(args) > 1 and args[1] == 'version':
                 return 'version 1.0'
             if len(args) > 1 and args[1] == 'devices':
                 return self._get_device_output()
             if len(args) > 3 and args[3] == 'command':
                 return 'mockoutput'
+            if len(args) > 5 and args[5] == 'battery':
+                return 'level: 99'
 
         return ''
 
     def last_command(self):
         return self._last_command
 
     # Local private methods.
 
     def _get_device_output(self):
         serials = ['123456789ABCDEF0', '123456789ABCDEF1', '123456789ABCDEF2',
@@ skipping 16 matching lines @@
     def make_android_commands(self, device_count, serial):
         return chromium_android.AndroidCommands(self.make_executive(device_count), serial)
 
     # The "adb" binary with the latest version should be used.
     def serial_test_adb_command_path(self):
         executive = self.make_executive(0)
 
         chromium_android.AndroidCommands.set_adb_command_path_options(['path1', 'path2', 'path3'])
         self.assertEqual('path2', chromium_android.AndroidCommands.adb_command_path(executive))
 
-    # The get_devices() method should throw if there aren't any devices. Otherwise it returns an array.
-    def test_get_devices(self):
-        self.assertRaises(AssertionError, chromium_android.AndroidCommands.get_devices, self.make_executive(0))
-        self.assertEquals(1, len(chromium_android.AndroidCommands.get_devices(self.make_executive(1))))
-        self.assertEquals(5, len(chromium_android.AndroidCommands.get_devices(self.make_executive(5))))
-
     # 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')
         self.assertEquals(['adb', '-s', '123456789ABCDEF0'], android_commands.adb_command())
         self.assertEquals('123456789ABCDEF0', android_commands.get_serial())
 
     # Running an adb command should return the command's output.
     def test_run_command(self):
         android_commands = self.make_android_commands(1, '123456789ABCDEF0')
 
@@ skipping 61 matching lines @@
     # Tests the default timeouts for Android, which are different than the rest of Chromium.
     def test_default_timeout_ms(self):
         self.assertEqual(self.make_port(options=optparse.Values({'configuration': 'Release'})).default_timeout_ms(), 10000)
         self.assertEqual(self.make_port(options=optparse.Values({'configuration': 'Debug'})).default_timeout_ms(), 10000)
 
 
 class ChromiumAndroidDriverTest(unittest.TestCase):
     def setUp(self):
         self._mock_adb = MockAndroidDebugBridge(1)
         self._mock_executive = MockExecutive2(run_command_fn=self._mock_adb.run_command)
+
+        android_commands = chromium_android.AndroidCommands(self._mock_executive, '123456789ABCDEF0')
         self._port = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=self._mock_executive), 'chromium-android')
         self._driver = chromium_android.ChromiumAndroidDriver(self._port, worker_number=0,
-            pixel_tests=True, driver_details=chromium_android.ContentShellDriverDetails())
+            pixel_tests=True, driver_details=chromium_android.ContentShellDriverDetails(), android_commands=android_commands)
 
     # The cmd_line() method in the Android port is used for starting a shell, not the test runner.
     def test_cmd_line(self):
         self.assertEquals(['adb', '-s', '123456789ABCDEF0', 'shell'], self._driver.cmd_line(False, []))
 
     # Test that the Chromium Android port can interpret Android's shell output.
     def test_read_prompt(self):
         self._driver._server_process = driver_unittest.MockServerProcess(lines=['root@android:/ # '])
         self.assertIsNone(self._driver._read_prompt(time.time() + 1))
         self._driver._server_process = driver_unittest.MockServerProcess(lines=['$ '])
         self.assertIsNone(self._driver._read_prompt(time.time() + 1))
 
 
-class ChromiumAndroidDriverTwoDriverTest(unittest.TestCase):
+class ChromiumAndroidDriverTwoDriversTest(unittest.TestCase):
     # Test two drivers getting the right serial numbers, and that we disregard per-test arguments.
     def test_two_drivers(self):
         mock_adb = MockAndroidDebugBridge(2)
         mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
 
         port = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive), 'chromium-android')
         driver0 = chromium_android.ChromiumAndroidDriver(port, worker_number=0, pixel_tests=True,
-            driver_details=chromium_android.DumpRenderTreeDriverDetails())
+            driver_details=chromium_android.DumpRenderTreeDriverDetails(), android_commands=port._devices.get_device(mock_executive, 0))
         driver1 = chromium_android.ChromiumAndroidDriver(port, worker_number=1, pixel_tests=True,
-            driver_details=chromium_android.DumpRenderTreeDriverDetails())
+            driver_details=chromium_android.DumpRenderTreeDriverDetails(), android_commands=port._devices.get_device(mock_executive, 1))
 
         self.assertEqual(['adb', '-s', '123456789ABCDEF0', 'shell'], driver0.cmd_line(True, []))
         self.assertEqual(['adb', '-s', '123456789ABCDEF1', 'shell'], driver1.cmd_line(True, ['anything']))
 
 
 class ChromiumAndroidTwoPortsTest(unittest.TestCase):
     # Test that the driver's command line indeed goes through to the driver.
     def test_options_with_two_ports(self):
         mock_adb = MockAndroidDebugBridge(2)
         mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
 
         port0 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-android', options=MockOptions(additional_drt_flag=['--foo=bar']))
         port1 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-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'))
 
 
-class ChromiumAndroidDriverTwoDriversTest(unittest.TestCase):
-    # Test two drivers getting the right serial numbers, and that we disregard per-test arguments.
-    def test_two_drivers(self):
-        mock_adb = MockAndroidDebugBridge(2)
-        mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
-
-        port = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive), 'chromium-android')
-        driver0 = chromium_android.ChromiumAndroidDriver(port, worker_number=0, pixel_tests=True,
-            driver_details=chromium_android.ContentShellDriverDetails())
-        driver1 = chromium_android.ChromiumAndroidDriver(port, worker_number=1, pixel_tests=True,
-            driver_details=chromium_android.ContentShellDriverDetails())
-
-        self.assertEqual(['adb', '-s', '123456789ABCDEF0', 'shell'], driver0.cmd_line(True, []))
-        self.assertEqual(['adb', '-s', '123456789ABCDEF1', 'shell'], driver1.cmd_line(True, []))
-
-
 class ChromiumAndroidTwoPortsTest(unittest.TestCase):
     # Test that the driver's command line indeed goes through to the driver.
     def test_options_with_two_ports(self):
         mock_adb = MockAndroidDebugBridge(2)
         mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
 
         port0 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-android', options=MockOptions(additional_drt_flag=['--foo=bar']))
         port1 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-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'))