[Telemetry] Move from telemetry WaitFor to py_utils WaitFor

telemetry/telemetry/internal/story_runner.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import optparse
 import os
 import sys
 import time
 
+import py_utils
 from py_utils import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import exceptions
 from telemetry import decorators
 from telemetry.internal.actions import page_action
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.results import results_options
 from telemetry.internal.util import exception_formatter
 from telemetry import page
 from telemetry.page import legacy_page_test
@@ skipping 59 matching lines @@
     if not state.CanRunStory(story):
       results.AddValue(skip.SkipValue(
           story,
           'Skipped because story is not supported '
           '(SharedState.CanRunStory() returns False).'))
       return
     state.RunStory(results)
     if isinstance(test, story_test.StoryTest):
       test.Measure(state.platform, results)
   except (legacy_page_test.Failure, exceptions.TimeoutException,
-          exceptions.LoginException, exceptions.ProfilingException):
+          exceptions.LoginException, exceptions.ProfilingException,
+          py_utils.TimeoutException):
     ProcessError()
   except exceptions.Error:
     ProcessError()
     raise
   except page_action.PageActionNotSupported as e:
     results.AddValue(
         skip.SkipValue(story, 'Unsupported page action: %s' % e))
   except Exception:
     ProcessError(description='Unhandlable exception raised.')
     raise
@@ skipping 332 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')