Ubuntu Shorts App

Merge lp:~elopio/ubuntu-rssreader-app/fix1314531-update_external_feed into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. fix1314531-update_external_feed
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 218
Merged at revision: 218
Proposed branch: lp:~elopio/ubuntu-rssreader-app/fix1314531-update_external_feed
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 58 lines (+12/-8)
1 file modified
tests/autopilot/shorts_app/tests/test_rssreader.py (+12/-8)
To merge this branch: bzr merge lp:~elopio/ubuntu-rssreader-app/fix1314531-update_external_feed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+217794@code.launchpad.net

Commit message

Updated the values of the external feed.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:218
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/216/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2322
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/103

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/shorts_app/tests/test_rssreader.py'
--- tests/autopilot/shorts_app/tests/test_rssreader.py 2014-04-23 18:11:29 +0000
+++ tests/autopilot/shorts_app/tests/test_rssreader.py 2014-04-30 17:11:28 +0000
@@ -29,6 +29,10 @@
29logger = logging.getLogger(__name__)29logger = logging.getLogger(__name__)
3030
3131
32_EXTERNAL_FEED_URL = 'http://www.canonical.com/rss.xml'
33_EXTERNAL_FEED_TITLE = 'Ubuntu Insights'
34
35
32class BaseShortsAppTestCase(ShortsAppTestCase):36class BaseShortsAppTestCase(ShortsAppTestCase):
3337
34 def setUp(self):38 def setUp(self):
@@ -69,8 +73,8 @@
6973
70 def test_add_feed_to_new_topic(self):74 def test_add_feed_to_new_topic(self):
71 """Test that adding a feed to a new topic must show it in a new tab."""75 """Test that adding a feed to a new topic must show it in a new tab."""
72 test_feed_url = 'http://www.canonical.com/rss.xml'76 test_feed_url = _EXTERNAL_FEED_URL
73 test_feed_title = 'Insights'77 test_feed_title = _EXTERNAL_FEED_TITLE
74 test_topic = 'Test topic'78 test_topic = 'Test topic'
75 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)79 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
7680
@@ -168,8 +172,8 @@
168172
169 def test_remove_topic(self):173 def test_remove_topic(self):
170 """ test add and remove feed and topic"""174 """ test add and remove feed and topic"""
171 test_feed_url = 'http://www.canonical.com/rss.xml'175 test_feed_url = _EXTERNAL_FEED_URL
172 test_feed_title = 'Insights'176 test_feed_title = _EXTERNAL_FEED_TITLE
173 test_topic = 'Test topic'177 test_topic = 'Test topic'
174 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)178 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
175179
@@ -204,8 +208,8 @@
204 @unittest.skip("Can't see or get dynamic tabs")208 @unittest.skip("Can't see or get dynamic tabs")
205 def test_edit_topic(self):209 def test_edit_topic(self):
206 """test edit topic"""210 """test edit topic"""
207 test_feed_url = 'http://www.canonical.com/rss.xml'211 test_feed_url = _EXTERNAL_FEED_URL
208 test_feed_title = 'Insights'212 test_feed_title = _EXTERNAL_FEED_TITLE
209 test_topic = 'Test topic'213 test_topic = 'Test topic'
210214
211 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)215 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
@@ -258,8 +262,8 @@
258262
259 def setUp(self):263 def setUp(self):
260 super(ShortsTestCaseWithTopicAndFeed, self).setUp()264 super(ShortsTestCaseWithTopicAndFeed, self).setUp()
261 test_feed_url = 'http://www.canonical.com/rss.xml'265 test_feed_url = _EXTERNAL_FEED_URL
262 self.test_feed_title = 'Insights'266 self.test_feed_title = _EXTERNAL_FEED_TITLE
263 self.test_topic = 'Test topic'267 self.test_topic = 'Test topic'
264 self.add_feed_to_new_topic(268 self.add_feed_to_new_topic(
265 test_feed_url, self.test_feed_title, self.test_topic)269 test_feed_url, self.test_feed_title, self.test_topic)

Subscribers

People subscribed via source and target branches