Handle content_shell failing to start on android as device going offline.

Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py

 # Copyright (C) 2011 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 19 matching lines @@
 import math
 import threading
 import time
 
 from webkitpy.common import message_pool
 from webkitpy.layout_tests.controllers import single_test_runner
 from webkitpy.layout_tests.models.test_run_results import TestRunResults
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models import test_results
+from webkitpy.layout_tests.port import driver
 from webkitpy.tool import grammar
 
 
 _log = logging.getLogger(__name__)
 
 
 TestExpectations = test_expectations.TestExpectations
 
 # Export this so callers don't need to know about message pools.
 WorkerException = message_pool.WorkerException
@@ skipping 181 matching lines @@
         self._host = self._caller.host
         self._filesystem = self._host.filesystem
         self._port = self._host.port_factory.get(self._options.platform, self._options)
 
         self._batch_count = 0
         self._batch_size = self._options.batch_size or 0
 
     def handle(self, name, source, test_list_name, test_inputs):
         assert name == 'test_list'
         for i, test_input in enumerate(test_inputs):
-            device_offline = self._run_test(test_input, test_list_name)
-            if device_offline:
-                self._caller.post('device_offline', test_list_name, test_inputs[i + 1:])
+            try:
+                device_offline = self._run_test(test_input, test_list_name)
+                # FIXME: Do we need both the DriverOutput.device_offline and the exception?
+                if device_offline:

[Peter Beverloo, 2013/10/15 16:40:08]

nit: throw a DeviceOffline exception to avoid code duplication with lines
249-253?

+                    self._caller.post('device_offline', test_list_name, test_inputs[i + 1:])
+                    self._caller.stop_running()
+                    return
+            except driver.DeviceOffline as e:
+                _log.error('Device offline: %s' % repr(e))
+                self._caller.post('device_offline', test_list_name, test_inputs[i:])
                 self._caller.stop_running()
                 return
 
         self._caller.post('finished_test_list', test_list_name)
 
     def _update_test_input(self, test_input):
         if test_input.reference_files is None:
             # Lazy initialization.
             test_input.reference_files = self._port.reference_files(test_input.test_name)
         if test_input.reference_files:
@@ skipping 228 matching lines @@
         def split_at(seq, index):
             return (seq[:index], seq[index:])
 
         num_old_per_new = divide_and_round_up(len(old_shards), max_new_shards)
         new_shards = []
         remaining_shards = old_shards
         while remaining_shards:
             some_shards, remaining_shards = split_at(remaining_shards, num_old_per_new)
             new_shards.append(TestShard('%s_%d' % (shard_name_prefix, len(new_shards) + 1), extract_and_flatten(some_shards)))
         return new_shards