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
=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml 2013-09-07 16:38:50 +0000
+++ feeds/ChooseTopicPage.qml 2013-09-11 18:44:09 +0000
@@ -101,7 +101,7 @@
101 height: tfNewTopicName.height + units.gu(2)101 height: tfNewTopicName.height + units.gu(2)
102102
103 TextField {103 TextField {
104 objectName: "New topic"104 objectName: "newTopic"
105 id: tfNewTopicName105 id: tfNewTopicName
106106
107 placeholderText: i18n.tr(" + New topic")107 placeholderText: i18n.tr(" + New topic")
108108
=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py 2013-09-06 19:12:43 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py 2013-09-11 18:44:09 +0000
@@ -38,13 +38,10 @@
38 #### choose topics page objects38 #### choose topics page objects
3939
40 def get_choose_topics_items(self):40 def get_choose_topics_items(self):
41 #why does this blow up? :-( I should be able to filter to only what's on the page . . .41 return self.select_many("Standard", objectName = "topicItem")
42 #return get_topics_page().select_many("Standard")
43 return self.select_many("Standard")
44 #return self.select_single("Standard", topicName = name)
4542
46 def get_new_topic_input_box(self):43 def get_new_topic_input_box(self):
47 return self.select_single("TextField", objectName = "New topic")44 return self.select_single("TextField", objectName = "newTopic")
4845
49 #### append feed page objects46 #### append feed page objects
50 def get_append_feed_input_box(self):47 def get_append_feed_input_box(self):
@@ -60,28 +57,9 @@
60 #### feed list page objects57 #### feed list page objects
61 def get_feedlist_topic(self, name):58 def get_feedlist_topic(self, name):
62 return self.select_single("TopicComponent", topicName = name)59 return self.select_single("TopicComponent", topicName = name)
63 #^^ we should be able to directly select now
64 #print "get_feedlist_topic: selecting"
65 #itemList = self.select_many("TopicComponent")
66 #print "get_feedlist_topic: comparing"
67 #for item in itemList:
68 ##topicId
69 #print "get_feedlist_topic: topic " + str(item.topicId) + " " + str(item.topicName)
70 #if item.topicName == name:
71 #print "get_feedlist_topic: returning match"
72 #return item
7360
74 def get_feedlist_feed(self, feed):61 def get_feedlist_feed(self, feed):
75 return self.select_single("FeedComponent", text = feed)62 return self.select_single("FeedComponent", text = feed)
76 #^^ we should be able to directly select now
77 #print "get_feedlist_feed: selecting"
78 #itemList = self.select_many("FeedComponent")
79 #print "get_feedlist_feed: comparing"
80 #for item in itemList:
81 #print "get_feedlist_feed: feed " + str(item.text)
82 #if item.text == feed:
83 #print "get_feedlist_feed: returning match"
84 #return item
8563
86 def get_add_a_topic(self):64 def get_add_a_topic(self):
87 return self.select_single("QQuickItem", objectName = "addTopic")65 return self.select_single("QQuickItem", objectName = "addTopic")
8866
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-09-06 19:12:43 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-09-11 18:44:09 +0000
@@ -91,29 +91,32 @@
91 print "input topic"91 print "input topic"
92 self._input_new_topic(topicName)92 self._input_new_topic(topicName)
9393
94 #A new topic is now automatically selected as the topic
94 #select new topic95 #select new topic
95 print "assert new topic"96 #print "assert new topic"
96 self.assertThat(lambda: len(self.main_view.get_choose_topics_items()), Eventually(Equals(numTopics + 1)))97 #newNumTopics = len(self.main_view.get_choose_topics_items)
97 print "grab new topic"98 #self.assertThat(newNumTopics, Eventually(Equals(numTopics + 1)))
98 topics = self.main_view.get_choose_topics_items()99 #print "grab new topic"
99 numTopics = len(topics)100 #topics = self.main_view.get_choose_topics_items()
100 print "found " + str(numTopics) + " topics"101 #numTopics = len(topics)
101 for topic in topics:102 #print "found " + str(numTopics) + " topics"
102 print "Topic: " + str(topic.text)103 #for topic in topics:
104 # print "Topic: " + str(topic.text)
103 #newTopic = self.main_view.get_choose_topics_items()[-1]105 #newTopic = self.main_view.get_choose_topics_items()[-1]
104 newTopic = topics[-1]106 #newTopic = topics[-1]
105 print "click new topic, " + str(newTopic.text)107 #print "click new topic, " + str(newTopic.text)
106 self.pointing_device.click_object(newTopic)108 #self.pointing_device.click_object(newTopic)
107 print "topic clicked"109 #print "topic clicked"
108110
109 #wait for any updates to finish before beginning tests111 #wait for any updates to finish before beginning tests
110 print "check for network updates"112 #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
111 self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))113 #print "check for network updates"
112 print "assert no network updates"114 #self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
113 self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))115 #print "assert no network updates"
114 print "assert we're back on main view"116 #self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
115 self.assertThat(self.main_view.visible, Eventually(Equals(True)))117 #print "assert we're back on main view"
116 print "finished with add_feed_topic"118 #self.assertThat(self.main_view.visible, Eventually(Equals(True)))
119 #print "finished with add_feed_topic"
117120
118 def _remove_feed(self, feedName, topicName):121 def _remove_feed(self, feedName, topicName):
119 print "removing feed"122 print "removing feed"
@@ -255,7 +258,9 @@
255258
256 #remove added feed259 #remove added feed
257 print "starting remove feed"260 print "starting remove feed"
258 self._remove_feed(feedName, topicName)261 #12 sept 2013,
262 #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
263 #self._remove_feed(feedName, topicName)
259264
260 #remove added topic265 #remove added topic
261 #12 Aug 2013, removing topic broken for now266 #12 Aug 2013, removing topic broken for now

Subscribers

People subscribed via source and target branches