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
1=== modified file 'tests/autopilot/shorts_app/tests/test_rssreader.py'
2--- tests/autopilot/shorts_app/tests/test_rssreader.py 2014-04-23 18:11:29 +0000
3+++ tests/autopilot/shorts_app/tests/test_rssreader.py 2014-04-30 17:11:28 +0000
4@@ -29,6 +29,10 @@
5 logger = logging.getLogger(__name__)
6
7
8+_EXTERNAL_FEED_URL = 'http://www.canonical.com/rss.xml'
9+_EXTERNAL_FEED_TITLE = 'Ubuntu Insights'
10+
11+
12 class BaseShortsAppTestCase(ShortsAppTestCase):
13
14 def setUp(self):
15@@ -69,8 +73,8 @@
16
17 def test_add_feed_to_new_topic(self):
18 """Test that adding a feed to a new topic must show it in a new tab."""
19- test_feed_url = 'http://www.canonical.com/rss.xml'
20- test_feed_title = 'Insights'
21+ test_feed_url = _EXTERNAL_FEED_URL
22+ test_feed_title = _EXTERNAL_FEED_TITLE
23 test_topic = 'Test topic'
24 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
25
26@@ -168,8 +172,8 @@
27
28 def test_remove_topic(self):
29 """ test add and remove feed and topic"""
30- test_feed_url = 'http://www.canonical.com/rss.xml'
31- test_feed_title = 'Insights'
32+ test_feed_url = _EXTERNAL_FEED_URL
33+ test_feed_title = _EXTERNAL_FEED_TITLE
34 test_topic = 'Test topic'
35 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
36
37@@ -204,8 +208,8 @@
38 @unittest.skip("Can't see or get dynamic tabs")
39 def test_edit_topic(self):
40 """test edit topic"""
41- test_feed_url = 'http://www.canonical.com/rss.xml'
42- test_feed_title = 'Insights'
43+ test_feed_url = _EXTERNAL_FEED_URL
44+ test_feed_title = _EXTERNAL_FEED_TITLE
45 test_topic = 'Test topic'
46
47 self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
48@@ -258,8 +262,8 @@
49
50 def setUp(self):
51 super(ShortsTestCaseWithTopicAndFeed, self).setUp()
52- test_feed_url = 'http://www.canonical.com/rss.xml'
53- self.test_feed_title = 'Insights'
54+ test_feed_url = _EXTERNAL_FEED_URL
55+ self.test_feed_title = _EXTERNAL_FEED_TITLE
56 self.test_topic = 'Test topic'
57 self.add_feed_to_new_topic(
58 test_feed_url, self.test_feed_title, self.test_topic)

Subscribers

People subscribed via source and target branches