Bug 1381399 - Don't try to close reftest window if it's already closed, r=ato
authorJames Graham <james@hoppipolla.co.uk>
Thu, 29 Jun 2017 09:28:41 -0700
changeset 418675 51df2b486a06d03eaea567ab67059031d1e6179a
parent 418674 ee2ea88701216daa03c6517ed10537cff32fa27f
child 418676 a3f0953e4966f037237b45300d531ff7fd9e35fc
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1381399
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1381399 - Don't try to close reftest window if it's already closed, r=ato If the run ended with the reftest window closed e.g. because the final test timed out, we shouldn't try to close it again, since that results in an error. MozReview-Commit-ID: 7FW96EkfgBG
testing/marionette/reftest.js
--- a/testing/marionette/reftest.js
+++ b/testing/marionette/reftest.js
@@ -123,17 +123,19 @@ min-width: 600px; min-height: 600px; max
     }
     doc.appendChild(browser);
     reftestWin.gBrowser = browser;
 
     return reftestWin;
   }
 
   abort() {
-    this.driver.close();
+    if (this.reftestWin) {
+      this.driver.close();
+    }
     this.reftestWin = null;
   }
 
   /**
    * Run a specific reftest.
    *
    * The assumed semantics are those of web-platform-tests where
    * references form a tree and each test must meet all the conditions