Bug 1448808 - Bring back Calendar MozMill testing. a=backout
Backed out changeset fc93de1b8856 (
bug 1450128)
Backed out changeset 784233e550fd (
bug 1449487)
--- a/calendar/test/mozmill/mozmilltests.list
+++ b/calendar/test/mozmill/mozmilltests.list
@@ -1,1 +1,5 @@
-testDummy.js
+cal-recurrence
+invitations
+testBasicFunctionality.js
+testLocalICS.js
+testTodayPane.js
--- a/calendar/test/mozmill/shared-modules/test-calendar-utils.js
+++ b/calendar/test/mozmill/shared-modules/test-calendar-utils.js
@@ -2,17 +2,17 @@
* 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/. */
var MODULE_NAME = "calendar-utils";
var RELATIVE_ROOT = "../shared-modules";
var MODULE_REQUIRES = ["window-helpers", "folder-display-helpers", "pref-window-helpers"];
ChromeUtils.import("resource://gre/modules/Services.jsm");
-// Disabled, see bug 1449487. ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
+ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
var os = {};
ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
var frame = {};
ChromeUtils.import("chrome://mozmill/content/modules/frame.js", frame);
var SHORT_SLEEP = 100;
var MID_SLEEP = 500;
var TIMEOUT_MODAL_DIALOG = 30000;
deleted file mode 100644
--- a/calendar/test/mozmill/testDummy.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* 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/. */
-
-// Dummy file to keep mozmilltests.list non-empty. See bug 1449487.
-
-var MODULE_NAME = "testDummy";
-var RELATIVE_ROOT = "./shared-modules";
-var MODULE_REQUIRES = [];
-var controller = {};
-ChromeUtils.import("chrome://mozmill/content/modules/controller.js", controller);
-
-function setupModule(module) {}
-
-function test_dummy() {
- // Make the test do something so it doesn't cause bug 1450128.
- dump("testDummy: Sleeping 20 seconds\n");
- controller.sleep(20000);
-}
-
-function teardownTest(module) {}