Merge lp:~nskaggs/ubuntu-rssreader-app/fix-debian-control into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Joey Chan
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~nskaggs/ubuntu-rssreader-app/fix-debian-control
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 50 lines (+6/-7)
2 files modified
debian/control (+2/-1)
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+4/-6)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-rssreader-app/fix-debian-control
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+180372@code.launchpad.net

Commit message

Small cleanups for dependencies

Description of the change

Small cleanups for dependencies

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
41. By Nicholas Skaggs

remove open toolbar line :)

Revision history for this message
Joey Chan (qqworini) wrote :

why it wasn't merged yet ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-07-10 14:20:14 +0000
+++ debian/control 2013-08-15 15:57:22 +0000
@@ -1,7 +1,7 @@
1Source: ubuntu-rssreader-app1Source: ubuntu-rssreader-app
2Priority: extra2Priority: extra
3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: debhelper (>= 9), 4Build-Depends: debhelper (>= 9),
5Standards-Version: 3.9.45Standards-Version: 3.9.4
6Section: misc6Section: misc
7Homepage: https://launchpad.net/ubuntu-rssreader-app7Homepage: https://launchpad.net/ubuntu-rssreader-app
@@ -24,6 +24,7 @@
24Architecture: all24Architecture: all
25Depends: libautopilot-qt,25Depends: libautopilot-qt,
26 libqt5test5,26 libqt5test5,
27 ubuntu-ui-toolkit-autopilot,
27 ubuntu-rssreader-app (= ${source:Version})28 ubuntu-rssreader-app (= ${source:Version})
28Description: Autopilot tests for RSS reader Application29Description: Autopilot tests for RSS reader Application
29 This package contains the autopilot tests for the RSS reader30 This package contains the autopilot tests for the RSS reader
3031
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-13 23:10:13 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-15 15:57:22 +0000
@@ -9,14 +9,9 @@
99
10from __future__ import absolute_import10from __future__ import absolute_import
1111
12import tempfile12
13import unittest13import unittest
1414
15import mock
16import os
17import os.path
18import shutil
19
20from autopilot.matchers import Eventually15from autopilot.matchers import Eventually
21from testtools.matchers import Equals, NotEquals, Is, Not16from testtools.matchers import Equals, NotEquals, Is, Not
2217
@@ -66,6 +61,9 @@
66 self.pointing_device.click_object(checkboxBtn)61 self.pointing_device.click_object(checkboxBtn)
67 self.assertThat(checkboxBtn.checked, Eventually(Equals(True)))62 self.assertThat(checkboxBtn.checked, Eventually(Equals(True)))
6863
64
65 toolbar = self.main_view.open_toolbar()
66
69 #click on Next button67 #click on Next button
70 self.assertThat(self.main_view.get_next_button, Eventually(Not(Is(None))))68 self.assertThat(self.main_view.get_next_button, Eventually(Not(Is(None))))
71 nextButton = self.main_view.get_next_button()69 nextButton = self.main_view.get_next_button()

Subscribers

People subscribed via source and target branches