From bbce2fdb206ba9a15e8391df3e7ce427175965bc Mon Sep 17 00:00:00 2001 From: Jonathan Griffin Date: Tue, 1 Apr 2014 10:02:09 -0700 Subject: [PATCH] Bug 989048 - Use TimeoutException instead of Exception for emulator startup timeouts, r=mdas --- testing/marionette/client/marionette/emulator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py index 86aab4bdc8f..b131262a258 100644 --- a/testing/marionette/client/marionette/emulator.py +++ b/testing/marionette/client/marionette/emulator.py @@ -348,7 +348,7 @@ waitFor( while online - original_online == set([]): time.sleep(1) if datetime.datetime.now() - now > datetime.timedelta(seconds=60): - raise Exception('timed out waiting for emulator to start') + raise TimeoutException('timed out waiting for emulator to start') online, offline = self._get_adb_devices() self.port = int(list(online - original_online)[0]) self._emulator_launched = True