Merge lp:~nskaggs/ubuntu-calendar-app/skip-edit-test into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Skip edit test except on desktop

Skip edit test except on desktop

[Nicholas Skaggs (nskaggs)]

Do not merge this mp unless a workaround is unable to be found.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

How did this got merged ?

[Nekhelesh Ramananthan (nik90)]

Mihir this was causing the tests to loop infinitely in jenkins. We had to disable this for the image promotion #203.

[Leo Arias (elopio)]

I approved it because the solution took longer than expected, and it was on the toolkit so we need to wait for the next toolkit landing.

I've just reopened the calendar bug task: https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1359167

You will see linked to that bug the branch on the toolkit with the fix, and a blueprint where we track tests that are removed so we don't forget about re-adding them.

Sorry for the mess.

=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
--- tests/autopilot/calendar_app/tests/test_new_event.py	2014-08-13 01:23:12 +0000
+++ tests/autopilot/calendar_app/tests/test_new_event.py	2014-08-20 18:36:29 +0000
@@ -22,6 +22,8 @@
 
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
+from unittest import skipUnless
+from autopilot.platform import model
 
 from calendar_app import data
 from calendar_app.tests import CalendarTestCase
@@ -126,6 +128,7 @@
                 test_event.name), Eventually(
                 Equals(False)))
 
+    @skipUnless(model() == 'Desktop', 'skipping, bug 1359167')
     def test_edit_event_with_default_values(self):
         """Test editing an event change unique values of an event."""