Bug 753000 Set the Windows resolution on the unit test builders to 1280 x 1024 by using the new machine-configuration.json script from bug 712630. This should fix the Windows 7 MozMill unit test failures. r=irving
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 03 Jul 2012 16:22:22 +0100
changeset 12781 eac86a1b54c5239cb726874bdf4b1ea744c3b33f
parent 12780 d61f5bc92f00ca977e4f89845a8871517eb14aac
child 12782 ba0e8ddca94fb8b901f8a216ad52d3adaf1964ee
push idunknown
push userunknown
push dateunknown
reviewersirving
bugs753000, 712630
Bug 753000 Set the Windows resolution on the unit test builders to 1280 x 1024 by using the new machine-configuration.json script from bug 712630. This should fix the Windows 7 MozMill unit test failures. r=irving
mail/test/mozmill/quick-filter-bar/test-display-issues.js
testing/machine-configuration.json
--- a/mail/test/mozmill/quick-filter-bar/test-display-issues.js
+++ b/mail/test/mozmill/quick-filter-bar/test-display-issues.js
@@ -1,14 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /*
  * Test things of a visual nature.
+ * 
+ * Note: this test requires a screen resolution of 1280 x 1024 which is standard on
+ * the unit test machines (see also testing/machine-configuration.json).
  */
 
 var MODULE_NAME = 'test-keyboard-interface';
 
 const RELATIVE_ROOT = '../shared-modules';
 
 var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
                        'quick-filter-bar-helper'];
@@ -25,17 +28,17 @@ function setupModule(module) {
   qfb.installInto(module);
 
   folder = create_folder("QuickFilterBarDisplayIssues");
   be_in_folder(folder);
 }
 
 function wait_for_resize(width) {
   mc.waitFor(function () (mc.window.outerWidth == width),
-             "Timeout waiting for resize", 1000, 50);
+             "Timeout waiting for resize (is the screen resolution 1280 x 1024?)", 1000, 50);
 }
 
 function resize_to(width, height) {
   mark_action("test", "resize_to", [width, "x", height]);
   mc.window.resizeTo(width, height);
   // Give the event loop a spin in order to let the reality of an asynchronously
   //  interacting window manager have its impact.  This still may not be
   //  sufficient.
new file mode 100644
--- /dev/null
+++ b/testing/machine-configuration.json
@@ -0,0 +1,12 @@
+{
+    "win7": {
+        "screen_resolution": {
+            "x": 1280,
+            "y": 1024
+        },
+        "mouse_position": {
+            "x": 1010,
+            "y": 10
+        }
+    }
+}