Bug 1397612 - [marionette] Re-enable test TestQuitRestart.test_in_app_restart_safe_mode. r=ato
authorHenrik Skupin <mail@hskupin.info>
Mon, 22 Oct 2018 14:16:38 +0000
changeset 490688 9234d32ec23c45c8ba1ebce723d57adcf784fc57
parent 490687 6afa28099f1ec6f3533128f3f8ac596c622a09a6
child 490689 ffbc071b41bd30784c817593b200f9020c51c421
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersato
bugs1397612
milestone64.0a1
Bug 1397612 - [marionette] Re-enable test TestQuitRestart.test_in_app_restart_safe_mode. r=ato Differential Revision: https://phabricator.services.mozilla.com/D9389
testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
@@ -3,18 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import, print_function
 
 import sys
 import unittest
 import urllib
 
-from unittest import skip
-
 from marionette_driver import errors
 from marionette_driver.by import By
 from marionette_harness import MarionetteTestCase
 
 
 def inline(doc):
     return "data:text/html;charset=utf-8,{}".format(urllib.quote(doc))
 
@@ -209,17 +207,16 @@ class TestQuitRestart(MarionetteTestCase
             timeout_shutdown = self.marionette.shutdown_timeout
             self.marionette.shutdown_timeout = 5
 
             with self.assertRaisesRegexp(IOError, "the connection to Marionette server is lost"):
                 self.marionette.restart(in_app=True, callback=lambda: False)
         finally:
             self.marionette.shutdown_timeout = timeout_shutdown
 
-    @skip("Bug 1397612 - Hang of Marionette client after the restart")
     def test_in_app_restart_safe_mode(self):
 
         def restart_in_safe_mode():
             with self.marionette.using_context("chrome"):
                 self.marionette.execute_script("""
                   Components.utils.import("resource://gre/modules/Services.jsm");
 
                   let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]