Bug 1397612 - Backed out changeset 63d97c8b46b2 draft
authorHenrik Skupin <mail@hskupin.info>
Mon, 06 Nov 2017 13:43:42 +0100
changeset 693539 9e4d4c1928f854871654d62b73b5f748f3381d72
parent 693538 ec85e0d367466bb953492b6d6cc6861d66d8e8ee
child 739067 2521fe49293761ad5244f4f14c376c328c2cdee0
push id87841
push userbmo:hskupin@gmail.com
push dateMon, 06 Nov 2017 12:45:14 +0000
bugs1397612
milestone58.0a1
Bug 1397612 - Backed out changeset 63d97c8b46b2 This backs-out the skip patch for: test_quit_restart.py TestQuitRestart.test_in_app_restart_safe_mode MozReview-Commit-ID: 6lpUOdqoytT
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
@@ -193,18 +193,18 @@ class TestQuitRestart(MarionetteTestCase
             self.assertEqual(self.marionette.process_id, self.pid)
         else:
             self.assertNotEqual(self.marionette.process_id, self.pid)
 
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
                             "about:")
 
     def test_in_app_restart_safe_mode(self):
-        if self.marionette.session_capabilities["platformName"] != "linux":
-            raise unittest.SkipTest("Bug 1397612 - Hang of Marionette client after the restart.")
+        if self.marionette.session_capabilities["moz:headless"]:
+            raise unittest.SkipTest("Bug 1390848 - Hang of Marionette client after the restart.")
 
         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"]
                                      .createInstance(Ci.nsISupportsPRBool);