bug 613545: after each context menu test, wait until the context menu…

… popup is hidden before moving on to the next test; r=adw, a=self
mozilla · Nov 19, 2010 · 2391f25 · 2391f25
1 parent f70023e
commit 2391f25
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/packages/addon-kit/tests/test-context-menu.js b/packages/addon-kit/tests/test-context-menu.js
@@ -1280,17 +1280,27 @@ TestHelper.prototype = {
       this.test.done();
     }
 
-    this.contextMenuPopup.hidePopup();
+    function closeBrowserWindow() {
+      if (this.oldBrowserWindow) {
+        this.delayedEventListener(this.browserWindow, "unload", commonDone,
+                                  false);
+        this.browserWindow.close();
+        this.browserWindow = this.oldBrowserWindow;
+        delete this.oldBrowserWindow;
+      }
+      else {
+        commonDone.call(this);
+      }
+    };
 
-    if (this.oldBrowserWindow) {
-      this.delayedEventListener(this.browserWindow, "unload", commonDone,
-                                false);
-      this.browserWindow.close();
-      this.browserWindow = this.oldBrowserWindow;
-      delete this.oldBrowserWindow;
+    if (this.contextMenuPopup.state == "closed") {
+      closeBrowserWindow.call(this);
     }
     else {
-      commonDone.call(this);
+      this.delayedEventListener(this.contextMenuPopup, "popuphidden",
+                                function () closeBrowserWindow.call(this),
+                                false);
+      this.contextMenuPopup.hidePopup();
     }
   },