Bug 608431: Wait for window close before proceeding with tests. r=robstrong, a=tests
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 03 Nov 2010 12:47:03 -0700
changeset 56850 734d89f63682c568d8f328c55caf9d83f2ec0507
parent 56849 ccdbc1aa9377a529f499b6fced716b78079b2139
child 56851 3be753e18f9750844cb10a64c391f9bcd2806726
push id16713
push userdtownsend@mozilla.com
push dateWed, 03 Nov 2010 19:47:58 +0000
treeherdermozilla-central@734d89f63682 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrobstrong, tests
bugs608431
milestone2.0b8pre
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 608431: Wait for window close before proceeding with tests. r=robstrong, a=tests
toolkit/mozapps/extensions/test/browser/browser_bug557956.js
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
@@ -229,23 +229,25 @@ add_test(function() {
             EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
             wait_for_page(aWindow, "finished", function(aWindow) {
               var button = doc.documentElement.getButton("finish");
               ok(!button.hidden, "Finish button should not be hidden");
               ok(!button.disabled, "Finish button should not be disabled");
               EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
-              AddonManager.getAddonsByIDs(["addon8@tests.mozilla.org",
-                                           "addon9@tests.mozilla.org"],
-                                           function([a8, a9]) {
-                is(a8.version, "2.0", "addon8 should have updated");
-                is(a9.version, "2.0", "addon9 should have updated");
-
-                uninstall_test_addons(run_next_test);
+              wait_for_window_close(aWindow, function() {
+                AddonManager.getAddonsByIDs(["addon8@tests.mozilla.org",
+                                             "addon9@tests.mozilla.org"],
+                                             function([a8, a9]) {
+                  is(a8.version, "2.0", "addon8 should have updated");
+                  is(a9.version, "2.0", "addon9 should have updated");
+  
+                  uninstall_test_addons(run_next_test);
+                });
               });
             });
           });
         });
       });
     });
   });
 });
@@ -312,19 +314,21 @@ add_test(function() {
             var button = doc.documentElement.getButton("next");
             EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
             wait_for_page(aWindow, "installerrors", function(aWindow) {
               var button = doc.documentElement.getButton("finish");
               ok(!button.hidden, "Finish button should not be hidden");
               ok(!button.disabled, "Finish button should not be disabled");
 
-              EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
+              wait_for_window_close(aWindow, function() {
+                uninstall_test_addons(run_next_test);
+              });
 
-              uninstall_test_addons(run_next_test);
+              EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
             });
           });
         });
       });
     });
   });
 });
 
@@ -395,17 +399,20 @@ add_test(function() {
 
           var button = doc.documentElement.getButton("next");
           EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
           wait_for_page(aWindow, "noupdates", function(aWindow) {
             var button = doc.documentElement.getButton("finish");
             ok(!button.hidden, "Finish button should not be hidden");
             ok(!button.disabled, "Finish button should not be disabled");
-            EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
-            uninstall_test_addons(run_next_test);
+            wait_for_window_close(aWindow, function() {
+              uninstall_test_addons(run_next_test);
+            });
+
+            EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
           });
         });
       });
     });
   });
 });