Bug 1448808 - Bring back Calendar MozMill testing. a=backout
authorJorg K <jorgk@jorgk.com>
Wed, 20 Jun 2018 00:33:53 +0200
changeset 31764 07addfefa1b6a42f974d782c6d2676bbdcdfc57d
parent 31763 e81f4b59a00a7d3e18d50fd3851ecbd47762a186
child 31765 ca94a7325ca9bf00111ad2f0b95cae6a829a760b
push id2308
push userclokep@gmail.com
push dateWed, 05 Sep 2018 00:34:58 +0000
treeherdercomm-beta@e326b2dcd127 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1448808, 1450128, 1449487
Bug 1448808 - Bring back Calendar MozMill testing. a=backout Backed out changeset fc93de1b8856 (bug 1450128) Backed out changeset 784233e550fd (bug 1449487)
calendar/test/mozmill/mozmilltests.list
calendar/test/mozmill/shared-modules/test-calendar-utils.js
calendar/test/mozmill/testDummy.js
--- 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) {}