Ubuntu Shorts App

Merge lp:~nskaggs/ubuntu-rssreader-app/disable-remove-feed into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. disable-remove-feed
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 67
Merged at revision: 67
Proposed branch: lp:~nskaggs/ubuntu-rssreader-app/disable-remove-feed
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 128 lines (+28/-45)
3 files modified
feeds/ChooseTopicPage.qml (+1/-1)
tests/autopilot/ubuntu_rssreader_app/emulators.py (+2/-24)
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+25/-20)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-rssreader-app/disable-remove-feed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+185102@code.launchpad.net

Commit message

Disable remove feed and try and work around https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893 for now

Description of the change

Disable remove feed and try and work around https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893 for now

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:65
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/42/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/346
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/42

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/43/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/347
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/43

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:67
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/44/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/349
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/44

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'feeds/ChooseTopicPage.qml'
2--- feeds/ChooseTopicPage.qml 2013-09-07 16:38:50 +0000
3+++ feeds/ChooseTopicPage.qml 2013-09-11 18:44:09 +0000
4@@ -101,7 +101,7 @@
5 height: tfNewTopicName.height + units.gu(2)
6
7 TextField {
8- objectName: "New topic"
9+ objectName: "newTopic"
10 id: tfNewTopicName
11
12 placeholderText: i18n.tr(" + New topic")
13
14=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
15--- tests/autopilot/ubuntu_rssreader_app/emulators.py 2013-09-06 19:12:43 +0000
16+++ tests/autopilot/ubuntu_rssreader_app/emulators.py 2013-09-11 18:44:09 +0000
17@@ -38,13 +38,10 @@
18 #### choose topics page objects
19
20 def get_choose_topics_items(self):
21- #why does this blow up? :-( I should be able to filter to only what's on the page . . .
22- #return get_topics_page().select_many("Standard")
23- return self.select_many("Standard")
24- #return self.select_single("Standard", topicName = name)
25+ return self.select_many("Standard", objectName = "topicItem")
26
27 def get_new_topic_input_box(self):
28- return self.select_single("TextField", objectName = "New topic")
29+ return self.select_single("TextField", objectName = "newTopic")
30
31 #### append feed page objects
32 def get_append_feed_input_box(self):
33@@ -60,28 +57,9 @@
34 #### feed list page objects
35 def get_feedlist_topic(self, name):
36 return self.select_single("TopicComponent", topicName = name)
37- #^^ we should be able to directly select now
38- #print "get_feedlist_topic: selecting"
39- #itemList = self.select_many("TopicComponent")
40- #print "get_feedlist_topic: comparing"
41- #for item in itemList:
42- ##topicId
43- #print "get_feedlist_topic: topic " + str(item.topicId) + " " + str(item.topicName)
44- #if item.topicName == name:
45- #print "get_feedlist_topic: returning match"
46- #return item
47
48 def get_feedlist_feed(self, feed):
49 return self.select_single("FeedComponent", text = feed)
50- #^^ we should be able to directly select now
51- #print "get_feedlist_feed: selecting"
52- #itemList = self.select_many("FeedComponent")
53- #print "get_feedlist_feed: comparing"
54- #for item in itemList:
55- #print "get_feedlist_feed: feed " + str(item.text)
56- #if item.text == feed:
57- #print "get_feedlist_feed: returning match"
58- #return item
59
60 def get_add_a_topic(self):
61 return self.select_single("QQuickItem", objectName = "addTopic")
62
63=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
64--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-09-06 19:12:43 +0000
65+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-09-11 18:44:09 +0000
66@@ -91,29 +91,32 @@
67 print "input topic"
68 self._input_new_topic(topicName)
69
70+ #A new topic is now automatically selected as the topic
71 #select new topic
72- print "assert new topic"
73- self.assertThat(lambda: len(self.main_view.get_choose_topics_items()), Eventually(Equals(numTopics + 1)))
74- print "grab new topic"
75- topics = self.main_view.get_choose_topics_items()
76- numTopics = len(topics)
77- print "found " + str(numTopics) + " topics"
78- for topic in topics:
79- print "Topic: " + str(topic.text)
80+ #print "assert new topic"
81+ #newNumTopics = len(self.main_view.get_choose_topics_items)
82+ #self.assertThat(newNumTopics, Eventually(Equals(numTopics + 1)))
83+ #print "grab new topic"
84+ #topics = self.main_view.get_choose_topics_items()
85+ #numTopics = len(topics)
86+ #print "found " + str(numTopics) + " topics"
87+ #for topic in topics:
88+ # print "Topic: " + str(topic.text)
89 #newTopic = self.main_view.get_choose_topics_items()[-1]
90- newTopic = topics[-1]
91- print "click new topic, " + str(newTopic.text)
92- self.pointing_device.click_object(newTopic)
93- print "topic clicked"
94+ #newTopic = topics[-1]
95+ #print "click new topic, " + str(newTopic.text)
96+ #self.pointing_device.click_object(newTopic)
97+ #print "topic clicked"
98
99 #wait for any updates to finish before beginning tests
100- print "check for network updates"
101- self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
102- print "assert no network updates"
103- self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
104- print "assert we're back on main view"
105- self.assertThat(self.main_view.visible, Eventually(Equals(True)))
106- print "finished with add_feed_topic"
107+ #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
108+ #print "check for network updates"
109+ #self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
110+ #print "assert no network updates"
111+ #self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
112+ #print "assert we're back on main view"
113+ #self.assertThat(self.main_view.visible, Eventually(Equals(True)))
114+ #print "finished with add_feed_topic"
115
116 def _remove_feed(self, feedName, topicName):
117 print "removing feed"
118@@ -255,7 +258,9 @@
119
120 #remove added feed
121 print "starting remove feed"
122- self._remove_feed(feedName, topicName)
123+ #12 sept 2013,
124+ #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
125+ #self._remove_feed(feedName, topicName)
126
127 #remove added topic
128 #12 Aug 2013, removing topic broken for now

Subscribers

People subscribed via source and target branches