Merge lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test into lp:mediaplayer-app

Proposed by Brendan Donegan
Status: Superseded
Proposed branch: lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test
Merge into: lp:mediaplayer-app
Diff against target: 58 lines (+0/-48)
1 file modified
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+0/-48)
To merge this branch: bzr merge lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Leo Arias (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+226679@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-15.

Commit message

Remove both scene_selector tests as that feature is dropped

Description of the change

We remove the two scene selector tests because this feature is dropped.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
240. By Brendan Donegan

Merged with lp:~barry/mediaplayer-app/py3autopilot

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
2--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-04-17 21:30:48 +0000
3+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-07-14 14:37:59 +0000
4@@ -75,54 +75,6 @@
5 self.assertProperty(player, playing=True, paused=False)
6 self.assertProperty(playback_button, icon="pause")
7
8- @skip("New backend work needed. bug 1231147")
9- def test_scene_selector_visibility(self):
10- self.show_controls()
11- self.pause_video()
12-
13- scene_selector = self.main_window.get_scene_selector()
14- slider = self.main_window.get_slider()
15-
16- """ Default state is hide """
17- self.assertProperty(scene_selector, visible=False)
18-
19- """ Scene selector must apper when clicking int the slider handler """
20- self.pointing_device.click_object(slider)
21- self.assertProperty(scene_selector, visible=True)
22-
23- """ click again must dismiss the scene selector """
24- self.pointing_device.click()
25- self.assertProperty(scene_selector, visible=False)
26-
27- @skip("fails on touch and is not reliable on different screen resolutions. bug 1183245")
28- def test_scene_selector_operation(self):
29- self.show_controls()
30- self.pause_video()
31-
32- slider = self.main_window.get_slider()
33- time_line = self.main_window.get_timeline()
34- selector = self.main_window.get_scene_selector()
35- self.assertThat(selector.count, Eventually(GreaterThan(3)))
36-
37- """ Show scene selector """
38- self.pointing_device.click_object(slider)
39-
40- """ Make sure that the scenes are in correct place """
41- scene_0 = self.main_window.get_scene_0()
42- selectorRect = selector.globalRect
43- self.pointing_device.drag(
44- selectorRect[0], selectorRect[1] + selectorRect[3] / 2,
45- selectorRect[0] + selectorRect[2], selectorRect[1] + selectorRect[3] / 2)
46- self.assertThat(selector.moving, Eventually(Equals(False)))
47- self.assertThat(scene_0.x, Eventually(Equals(0)))
48-
49- """ Click in the second scene """
50- scene_2 = self.main_window.get_scene_2()
51- self.assertThat(scene_2.ready, Eventually(Equals(True)))
52- self.pointing_device.click_object(scene_2)
53- self.assertThat(selector.currentIndex, Eventually(Equals(2)))
54- self.assertProperty(time_line, value=1.107)
55-
56 @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
57 def test_time_display_behavior(self):
58 self.show_controls()

Subscribers

People subscribed via source and target branches