Merge lp:~nik90/ubuntu-clock-app/reenable-alarm-tests into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Re-enabled alarm tests on phone which were originally disabled due to upstream autopilot bug.

Re-enabled alarm tests on phone which were originally disabled due to upstream autopilot bug.

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

FAILED: Continuous integration, rev:225
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/629/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2369/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/629/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/reenable-alarm-tests]

226. By Nekhelesh Ramananthan on 2015-03-19

Fixed pyflakes error and updated copyright header

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

PASSED: Continuous integration, rev:226
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/630/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2382
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2382/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/630/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-12 23:23:31 +0000
+++ debian/changelog	2015-03-19 23:58:26 +0000
@@ -12,6 +12,8 @@
   * Fixed empty state description not wrapping (LP: #1428165)
   * Fixed edit alarm crash issue in vivid (thanks to Zsombor) (LP: #1429273)
   * Fixed strings not following gettext-style plural forms. (LP: #1431446)
+  * Renabled create alarm tests on device which were disabled due to upstream bug
+    in autopilot. (LP: #1426108)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_alarm.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2014-10-02 19:52:16 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2015-03-19 23:58:26 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Canonical Ltd
+# Copyright (C) 2014-2015 Canonical Ltd
 #
 # This file is part of Ubuntu Clock App
 #
@@ -19,12 +19,10 @@
 from __future__ import absolute_import
 
 import datetime
-import unittest
 
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 from ubuntu_clock_app.tests import ClockAppTestCase
-from autopilot.platform import model
 
 
 class TestAlarm(ClockAppTestCase):
@@ -71,12 +69,6 @@
 
         self.page = self.main_view.open_alarm()
 
-    # TODO
-    # Due to bug https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1328600
-    # this test cannot be run on device, so until the bug is not fixed we are
-    # skipping the test if model not Desktop.
-    @unittest.skipIf(model() != 'Desktop',
-                     "datepicker does not work correctly on device")
     def test_add_recurring_type_alarm_must_add_to_alarm_list(self):
         """Test to check if alarms are saved properly