Bug 1481052 - Work around test that causes Mozmill to die a horrible death; rs=bustage-fix a=jorgk
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 29 Nov 2018 23:18:46 +1300
changeset 32679 5e00c85f4d23b0187b26dca3c33439b6a1c60b89
parent 32678 9398d440a92d2e9a4f9126cd7287abb0ba5397ff
child 32680 7ee2051d5d5d1b587a2c0ab2280a36feb5bfb277
push id2341
push usermozilla@jorgk.com
push dateThu, 29 Nov 2018 15:19:09 +0000
treeherdercomm-beta@7ee2051d5d5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix, jorgk
bugs1481052
Bug 1481052 - Work around test that causes Mozmill to die a horrible death; rs=bustage-fix a=jorgk
mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
--- a/mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
+++ b/mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
@@ -86,17 +86,20 @@ function get_accept_button(aController) 
 /**
  * Helper function that waits for the contents of the Filelink provider
  * settings IFrame to be fully loaded.
  *
  * @param aController a controller for an 'Add an Account' dialog
  * @param aURL the expected URL for the IFrame to load.
  */
 function wait_for_settings_loaded(aController, aURL) {
-  wait_for_frame_load(aController.e('accountSettings'), aURL);
+  // Mozmill chokes horribly here, so don't look directly into the iframe.
+  aController.waitFor(() => {
+    return aController.e("accountType").nextElementSibling.src == aURL;
+  });
 }
 
 /**
  * Test that when the dialog first spawns, and the 'Select an account type'
  * menuitem is selected, that the accept button is disabled.
  */
 function test_accept_disabled_by_default() {
   gMockCloudfileManager.register('service1');