Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Revert "Bug 1095712 - Reenable disabled calendar marionette tests r=g…
Browse files Browse the repository at this point in the history
…aye"

This reverts commit a34f452.
  • Loading branch information
KevinGrandon committed May 28, 2015
1 parent cb55b07 commit 1870f54
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 8 deletions.
15 changes: 8 additions & 7 deletions apps/calendar/test/marionette/create_event_test.js
@@ -1,9 +1,10 @@
'use strict';

var Calendar = require('./lib/calendar');
var assert = require('chai').assert;
var Calendar = require('./lib/calendar'),
assert = require('chai').assert;

marionette('creating events', function() {
var app;
var client = marionette.client({
profile: {
prefs: {
Expand All @@ -17,15 +18,15 @@ marionette('creating events', function() {
}
});

var app;
var startDate = new Date('Sep 08 1991 12:34:56'),
startDateNextHour = new Date(startDate),
startDateNextDay = new Date(startDate),
scenarios;

var startDate = new Date('Sep 08 1991 12:34:56');
var startDateNextHour = new Date(startDate);
startDateNextHour.setHours(startDate.getHours() + 1);
var startDateNextDay = new Date(startDate);
startDateNextDay.setDate(startDate.getDate() + 1);

var scenarios = [
scenarios = [
{
name: 'one day',
allDay: false,
Expand Down
2 changes: 1 addition & 1 deletion apps/calendar/test/marionette/toggle_calendar_test.js
Expand Up @@ -102,7 +102,7 @@ marionette('toggle calendar', function() {
return app.day.events.length === 0;
});
assert.ok(
app.day.allDaysHolder.displayed(),
app.day.allDay.displayed(),
'all day should be displayed'
);
});
Expand Down
2 changes: 2 additions & 0 deletions shared/test/integration/tbpl-manifest.json
Expand Up @@ -5,6 +5,8 @@
"apps/calendar/test/marionette/day_view_test.js": "Bug 1076716 - TEST-UNEXPECTED-FAIL | day view before each hook",
"apps/calendar/test/marionette/server_test.js": "",
"apps/calendar/test/marionette/week_view_test.js": "Bug 1060447 - Re-enable week_view_test.js",
"apps/calendar/test/marionette/toggle_calendar_test.js": "Bug 1007519 - Perma failing test, toggle calendar > regular event disable calendar day view",
"apps/calendar/test/marionette/create_event_test.js": "Bug 1059159 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/create_event_test.js",
"apps/camera/test/marionette/capture_test.js": "device only - missing desktop shims",
"apps/camera/test/marionette/hud_test.js": "device only - missing desktop shims",
"apps/camera/test/marionette/settings_test.js": "device only - missing desktop shims",
Expand Down
39 changes: 39 additions & 0 deletions shared/test/integration/travis-manifest.json
@@ -0,0 +1,39 @@
{
"blacklist": {
"apps/calendar/test/marionette/alarm_test.js": "Bug 994976 - Perma-red TBPL test, alarm > without alarm mocks create two events with simultaneous reminders",
"apps/calendar/test/marionette/caldav_test.js": "Bug 972631 - CalDAV setup causing tbpl timeouts",
"apps/calendar/test/marionette/create_event_test.js": "Bug 1059159 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/create_event_test.js",
"apps/calendar/test/marionette/day_view_test.js": "Bug 1076716 - TEST-UNEXPECTED-FAIL | day view before each hook",
"apps/calendar/test/marionette/server_test.js": "",
"apps/calendar/test/marionette/day_view_test.js": "",
"apps/calendar/test/marionette/month_view_test.js": "",
"apps/calendar/test/marionette/toggle_calendar_test.js": "Bug 1007519 - Perma failing test, toggle calendar > regular event disable calendar day view",
"apps/camera/test/marionette/capture_test.js": "device only - missing desktop shims",
"apps/camera/test/marionette/hud_test.js": "device only - missing desktop shims",
"apps/camera/test/marionette/settings_test.js": "device only - missing desktop shims",
"apps/camera/test/marionette/zoom_test.js": "device only - missing desktop shims",
"apps/clock/test/marionette/alarm_test.js": "Bug 1035930 - TEST-UNEXPECTED-FAIL | Alarm System statusbar shows an icon when an alarm is active",
"apps/communications/contacts/test/marionette/form_test.js": "Bug 1031078 - Intermittent form_test.js | Contacts > Form Facebook contacts Add phone number from Dialer to existing Facebook contact",
"apps/email/test/marionette/activity_create_email_account_complete_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/local_drafts_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/next_previous_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/notification_click_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/notification_disable_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/notification_foreground_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/notification_set_interval_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/reply_imap_email_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/email/test/marionette/send_imap_email_test.js": "Bug 975588 - Re-enable email marionette js tests",
"apps/homescreen/test/marionette/install_bookmark_test.js": "legacy",
"apps/homescreen/test/marionette/remove_bookmark_test.js": "legacy",
"apps/homescreen/test/marionette/update_bookmark_test.js": "legacy",
"apps/search/test/marionette/app_search_test.js": " Bug 1035936 - TEST-UNEXPECTED-FAIL | Search - App search Search for app with entry point",
"apps/settings/test/marionette/tests/airplane_mode_settings_test.js": "",
"apps/settings/test/marionette/tests/app_permission_settings_test.js": "Bug 1004348 - Disable intermittent failing test, manipulate app permissions set geolocation of first app to Grant",
"apps/settings/test/marionette/tests/message_settings_test.js": "",
"apps/system/test/marionette/app_usage_metrics_test.js": "Bug 1049137 - Intermittent failing test, TEST-UNEXPECTED-FAIL | App Usage Metrics > Uninstalled apps are counted",
"apps/system/test/marionette/edges_gesture_test.js": "Bug 1045729 - Intermittent failing test, Edges gesture > before each hook",
"apps/system/fxa/test/marionette/fxa_screen_flow_test.js": "Bug 1064305 - [Marionette] FxA tests - intermittent timeout failures on system/fxa/test/marionette/fxa_screen_flow_test.js",
"apps/system/test/marionette/homescreen_navigation_test.js": "Bug 1043870 - TEST-UNEXPECTED-FAIL | Homescreen navigation > Going to the homescreen and back to a warm app",
"apps/verticalhome/test/marionette/app_hosted_use_cached_icon_test.js": "Bug 1037194 - TEST-UNEXPECTED-FAIL | Vertical Home - Hosted app cached icon fetch fallback to default icon"
}
}

0 comments on commit 1870f54

Please sign in to comment.