Bug 578675 Adapt MozMill test harness and tests to work with the upgraded MozMill 1.4.2b1. r=bienvenu,a=Standard8 CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 15 Jul 2010 16:55:17 +0100
changeset 5841 cd368d1e37a113764479a3913bd4090766bf590e
parent 5840 54a1b8832eaf5892895a1f6433de4d4154d61d9a
child 5842 32c10aa6b815aa4ef8aac6e654fd68b6cddf6d92
push idunknown
push userunknown
push dateunknown
reviewersbienvenu, Standard8
bugs578675
Bug 578675 Adapt MozMill test harness and tests to work with the upgraded MozMill 1.4.2b1. r=bienvenu,a=Standard8 CLOSED TREE
mail/build.mk
mail/test/mozmill/attachment/test-attachment.js
mail/test/mozmill/migration-from-tb2/prefs.js
mail/test/mozmill/shared-modules/test-folder-display-helpers.js
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -103,22 +103,20 @@ include $(topsrcdir)/mailnews/testsuite-
 MOZMILLDIR=$(DEPTH)/mozilla/_tests/mozmill
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Mac options
 APP_NAME = $(MOZ_APP_DISPLAYNAME)
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
-PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
-PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
+PROGRAM = ../../../$(DIST)/$(APP_NAME).app/
 else
 # Non-mac options
-PROGRAM_LOCATION = ../../../$(DIST)/bin/
-PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
+PROGRAM = ../../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
 endif
 
 mozmill::
 	cd $(MOZMILLDIR) && MACOSX_DEPLOYMENT_TARGET= $(PYTHON) \
 	runtestlist.py --list=mozmilltests.list --binary=$(PROGRAM) \
 	--dir=$(call core_abspath,$(topsrcdir))/mail/test/mozmill \
 	--symbols-path=$(call core_abspath,$(DIST)/crashreporter-symbols) \
 	$(MOZMILL_EXTRA)
--- a/mail/test/mozmill/attachment/test-attachment.js
+++ b/mail/test/mozmill/attachment/test-attachment.js
@@ -44,17 +44,17 @@ var MODULE_NAME = 'test-attachment';
 
 var RELATIVE_ROOT = '../shared-modules';
 var MODULE_REQUIRES = ['folder-display-helpers', 'compose-helpers'];
 var jumlib = {};
 Components.utils.import("resource://mozmill/modules/jum.js", jumlib);
 var elib = {};
 Components.utils.import('resource://mozmill/modules/elementslib.js', elib);
 var EventUtils = {};
-Cu.import('resource://mozmill/modules/EventUtils.js', EventUtils);
+Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 
 var folder = null;
 var composeHelper = null;
 var gMsgNo = 0;
 
 /**
  * The TESTS array is constructed from objects containing the following:
  *
--- a/mail/test/mozmill/migration-from-tb2/prefs.js
+++ b/mail/test/mozmill/migration-from-tb2/prefs.js
@@ -7,16 +7,17 @@
  *
  * To make a manual change to preferences, you can visit the URL about:config
  * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
  */
 
 user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1273257684);
+user_pref("extensions.checkCompatibility.3.2a", false);
 user_pref("extensions.lastAppVersion", "2.0.0.24");
 user_pref("intl.charsetmenu.mailview.cache", "windows-1252, ISO-8859-1, UTF-8");
 user_pref("ldap_2.prefs_migrated", true);
 user_pref("ldap_2.servers.default.filename", "default.mab");
 user_pref("ldap_2.servers.default.replication.lastChangeNumber", 0);
 user_pref("ldap_2.servers.default.uri", "moz-abldapdirectory://default.mab");
 user_pref("ldap_2.servers.history.replication.lastChangeNumber", 0);
 user_pref("ldap_2.servers.pab.replication.lastChangeNumber", 0);
--- a/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
@@ -36,17 +36,17 @@
 
 var Ci = Components.interfaces;
 var Cc = Components.classes;
 var Cu = Components.utils;
 
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
 var EventUtils = {};
-Cu.import('resource://mozmill/modules/EventUtils.js', EventUtils);
+Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 var mozmill = {};
 Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var controller = {};
 Cu.import('resource://mozmill/modules/controller.js', controller);
 var frame = {};
 Cu.import('resource://mozmill/modules/frame.js', frame);
 var os = {};
 Cu.import('resource://mozmill/stdlib/os.js', os);