| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
|
| index 15eafe0005e9246b5295ffa644575722c6b48369..bb3253723cae710976c8798cc6bc4821cb5e7423 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
|
| @@ -49,6 +49,7 @@ WorkerException = message_pool.WorkerException
|
|
|
|
|
| class TestRunInterruptedException(Exception):
|
| +
|
| """Raised when a test run should be stopped immediately."""
|
|
|
| def __init__(self, reason):
|
| @@ -126,14 +127,14 @@ class LayoutTestRunner(object):
|
| if num_workers > 0:
|
| with message_pool.get(self, self._worker_factory, num_workers, self._port.host) as pool:
|
| pool.run(('test_list', shard.name, shard.test_inputs) for shard in self._shards_to_redo)
|
| - except TestRunInterruptedException, e:
|
| + except TestRunInterruptedException as e:
|
| _log.warning(e.reason)
|
| run_results.interrupted = True
|
| except KeyboardInterrupt:
|
| self._printer.flush()
|
| self._printer.writeln('Interrupted, exiting ...')
|
| run_results.keyboard_interrupted = True
|
| - except Exception, e:
|
| + except Exception as e:
|
| _log.debug('%s("%s") raised, exiting' % (e.__class__.__name__, str(e)))
|
| raise
|
| finally:
|
| @@ -340,6 +341,7 @@ class Worker(object):
|
|
|
|
|
| class TestShard(object):
|
| +
|
| """A test shard is a named list of TestInputs."""
|
|
|
| def __init__(self, name, test_inputs):
|
|
|