From e70b66c4fdd82cc2fdd297f335aae15bfac3427a Mon Sep 17 00:00:00 2001 From: Jonathan Griffin Date: Tue, 6 Aug 2013 16:03:39 -0700 Subject: [PATCH] Bug 758329 - Enable test_emulator_order.py. r=mdas --- .../client/marionette/tests/unit/test_emulator.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator.py b/testing/marionette/client/marionette/tests/unit/test_emulator.py index 28456ad5eb53..f6bcd6d0c7ae 100644 --- a/testing/marionette/client/marionette/tests/unit/test_emulator.py +++ b/testing/marionette/client/marionette/tests/unit/test_emulator.py @@ -17,14 +17,13 @@ class TestEmulatorContent(MarionetteTestCase): """); self.assertEqual(result, expected) -# disabled due to bug 758329 -# def test_emulator_order(self): -# self.marionette.set_script_timeout(10000) -# self.assertRaises(MarionetteException, -# self.marionette.execute_async_script, -# """runEmulatorCmd("gsm status", function(result) {}); -# marionetteScriptFinished(true); -# """); + def test_emulator_order(self): + self.marionette.set_script_timeout(10000) + self.assertRaises(MarionetteException, + self.marionette.execute_async_script, + """runEmulatorCmd("gsm status", function(result) {}); + marionetteScriptFinished(true); + """); class TestEmulatorChrome(TestEmulatorContent):