From 1870f546a92b99c6e1aa2e98e56d9b28eeee61d3 Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Wed, 27 May 2015 23:30:47 -0400 Subject: [PATCH] Revert "Bug 1095712 - Reenable disabled calendar marionette tests r=gaye" This reverts commit a34f452a75802dd6455f836657d045caec4ac6e9. --- .../test/marionette/create_event_test.js | 15 +++---- .../test/marionette/toggle_calendar_test.js | 2 +- shared/test/integration/tbpl-manifest.json | 2 + shared/test/integration/travis-manifest.json | 39 +++++++++++++++++++ 4 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 shared/test/integration/travis-manifest.json diff --git a/apps/calendar/test/marionette/create_event_test.js b/apps/calendar/test/marionette/create_event_test.js index ea52a0107a1f..cec3fb63aabc 100644 --- a/apps/calendar/test/marionette/create_event_test.js +++ b/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: { @@ -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, diff --git a/apps/calendar/test/marionette/toggle_calendar_test.js b/apps/calendar/test/marionette/toggle_calendar_test.js index b5ee1c45f770..8014256683fc 100644 --- a/apps/calendar/test/marionette/toggle_calendar_test.js +++ b/apps/calendar/test/marionette/toggle_calendar_test.js @@ -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' ); }); diff --git a/shared/test/integration/tbpl-manifest.json b/shared/test/integration/tbpl-manifest.json index 5846ef86f912..cbddc6691d60 100644 --- a/shared/test/integration/tbpl-manifest.json +++ b/shared/test/integration/tbpl-manifest.json @@ -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", diff --git a/shared/test/integration/travis-manifest.json b/shared/test/integration/travis-manifest.json new file mode 100644 index 000000000000..cbc5c373f1df --- /dev/null +++ b/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" + } +}