[tbb-commits] [tor-browser/esr24] Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only

[mikeperry at torproject.org]

commit 467f9d81557f5f1222ca451340be61547b07c9ef
Author: Tim Taubert <ttaubert at mozilla.com>
Date:   Mon Apr 14 12:03:18 2014 +0200

    Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only
---
 .../sessionstore/test/browser_615394-SSWindowState_events.js      |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
index f699083..26064be 100644
--- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
+++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
@@ -2,7 +2,7 @@
  * 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/. */
 
-const stateBackup = ss.getBrowserState();
+const stateBackup = JSON.parse(ss.getBrowserState());
 const testState = {
   windows: [{
     tabs: [
@@ -73,8 +73,7 @@ function runNextTest() {
     waitForBrowserState(testState, currentTest);
   }
   else {
-    ss.setBrowserState(stateBackup);
-    finish();
+    waitForBrowserState(stateBackup, finish);
   }
 }