Bug 966234 - A shutdown after a restart causes Mozmill to open a new …

…Firefox process before the former one is gone. r=hskupin

mozmill/setup.py

@@ -11,7 +11,7 @@
 deps = ['jsbridge == 3.1-dev',
         'ManifestDestiny == 0.5.7',
         'mozinfo == 0.7',
-        'mozrunner == 5.33',
+        'mozrunner == 5.34',
         ]
 
 # take description from README

mutt/mutt/tests/python/js-modules/restartTests/testCountTestFailures.js

@@ -47,7 +47,7 @@ function testFailureWithRestart() {
   // Bug 886360
   // User shutdown tests are currently not supported
   // persisted.state.next = "testFailureWithUserRestart";
-  persisted.state.next = "testPassWithShutdown";
+  persisted.state.next = "testFailureWithShutdown";
   persisted.state.restart = true;
 
   assert.fail("A failing assertion with restarting the application has to be counted.");

mutt/mutt/tests/python/js-modules/test_shutdownAfterRestart/manifest.ini

@@ -0,0 +1,2 @@
+[test1.js]
+[test2.js]

mutt/mutt/tests/python/js-modules/test_shutdownAfterRestart/test1.js

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+function setupTest(aModule) {
+  aModule.controller = mozmill.getBrowserController();
+}
+
+function test1() {
+  controller.restartApplication("test2");
+}
+
+function test2() {
+  controller.stopApplication(true);
+}

mutt/mutt/tests/python/js-modules/test_shutdownAfterRestart/test2.js

@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+function test1() {
+  expect.pass();
+}

mutt/mutt/tests/python/test_restart.py

@@ -37,11 +37,15 @@ def do_test(self, test_path=None, manifest_path=None,
 
     def test_failures_with_restart(self):
         testpath = os.path.join("js-modules", "restartTests", "testCountTestFailures.js")
-        self.do_test(test_path=testpath, fails=4)
+        self.do_test(test_path=testpath, fails=3)
 
     def test_passes_with_restart(self):
         testpath = os.path.join("js-modules", "restartTests", "testCountTestPasses.js")
-        self.do_test(test_path=testpath, passes=4)
+        self.do_test(test_path=testpath, passes=3)
+
+    def test_restart_then_shutdown(self):
+        manifestpath = os.path.join("js-modules", "test_shutdownAfterRestart", "manifest.ini")
+        self.do_test(manifest_path=manifestpath, passes=3)
 
     def test_skipped_with_restart(self):
         testpath = os.path.join("js-modules", "restartTests", "testCountTestSkipped.js")