Merge lp:~renatofilho/mediaplayer-app/fix-1231418 into lp:mediaplayer-app

Proposed by Renato Araujo Oliveira Filho
Status: Rejected
Rejected by: Robert Bruce Park
Proposed branch: lp:~renatofilho/mediaplayer-app/fix-1231418
Merge into: lp:mediaplayer-app
Diff against target: 50 lines (+16/-1)
2 files modified
debian/control (+7/-0)
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+9/-1)
To merge this branch: bzr merge lp:~renatofilho/mediaplayer-app/fix-1231418
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Needs Resubmitting
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+188433@code.launchpad.net

Commit message

skipped tests due a bug on decode.

To post a comment you must log in.
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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :
review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

I'm rejecting this because it's nearly 2 months old with no activity. Feel free to resubmit if you want to try this branch again.

review: Needs Resubmitting

Unmerged revisions

147. By Renato Araujo Oliveira Filho

Added necessary dependency to autopilot tests.

146. By Renato Araujo Oliveira Filho

skiped tests due a bug on decode.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-09-25 23:08:08 +0000
+++ debian/control 2013-10-01 00:36:39 +0000
@@ -43,6 +43,13 @@
43 libqt5test5,43 libqt5test5,
44 libqt5widgets5,44 libqt5widgets5,
45 mediaplayer-app (>= ${source:Version}),45 mediaplayer-app (>= ${source:Version}),
46 libqt5multimedia5-touch,
47 libqt5multimedia5-touch-plugins,
48 libqt5multimediaquick-p5-touch,
49 qtdeclarative5-qtmultimedia-touch-plugin,
50 gstreamer1.0-plugins-good,
51 gstreamer1.0-hybris[armhf],
52 gstreamer1.0-plugins-bad
46Conflicts: media-player-autopilot53Conflicts: media-player-autopilot
47Replaces: media-player-autopilot54Replaces: media-player-autopilot
48Provides: media-player-autopilot55Provides: media-player-autopilot
4956
=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-09-25 21:19:34 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-10-01 00:36:39 +0000
@@ -132,11 +132,19 @@
132132
133 time_line = self.main_window.get_object("Slider", "TimeLine.Slider")133 time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
134 time_label = self.main_window.get_object("Label", "TimeLine.TimeLabel")134 time_label = self.main_window.get_object("Label", "TimeLine.TimeLabel")
135
136 """
137 New backend work needed. bug 1231147
135 scene_selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")138 scene_selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
139 """
136140
137 """ Seek to the midle of the movie """141 """ Seek to the midle of the movie """
138 self.pointing_device.click_object(time_line)142 self.pointing_device.click_object(time_line)
143
144 """
145 New backend work needed. bug 1231147
139 self.assertThat(scene_selector.opacity, Eventually(Equals(1)))146 self.assertThat(scene_selector.opacity, Eventually(Equals(1)))
147 """
140148
141 """ Time label must show the current video time (diff from zero or empty) """149 """ Time label must show the current video time (diff from zero or empty) """
142 self.assertNotEqual(time_label.text, "00:00:00")150 self.assertNotEqual(time_label.text, "00:00:00")
@@ -158,7 +166,7 @@
158166
159 """ avoid the test fails due the timeout """167 """ avoid the test fails due the timeout """
160 self.assertThat(time_label.text, Eventually(Equals("00:00:25"), timeout=35))168 self.assertThat(time_label.text, Eventually(Equals("00:00:25"), timeout=35))
161 169
162 controls = self.main_window.get_object("Controls", "controls")170 controls = self.main_window.get_object("Controls", "controls")
163 self.assertProperty(controls, visible=False)171 self.assertProperty(controls, visible=False)
164 self.assertThat(controls.visible, Eventually(Equals(True)))172 self.assertThat(controls.visible, Eventually(Equals(True)))

Subscribers

People subscribed via source and target branches