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

Proposed by Renato Araujo Oliveira Filho on 2013-09-30
Status: Rejected
Rejected by: Robert Bruce Park on 2013-11-22
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) 2013-09-30 Resubmit on 2013-11-22
PS Jenkins bot continuous-integration Needs Fixing on 2013-10-07
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Robert Bruce Park (robru) wrote :
review: Needs Fixing
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: Resubmit

Unmerged revisions

147. By Renato Araujo Oliveira Filho on 2013-10-01

Added necessary dependency to autopilot tests.

146. By Renato Araujo Oliveira Filho on 2013-09-30

skiped tests due a bug on decode.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-09-25 23:08:08 +0000
3+++ debian/control 2013-10-01 00:36:39 +0000
4@@ -43,6 +43,13 @@
5 libqt5test5,
6 libqt5widgets5,
7 mediaplayer-app (>= ${source:Version}),
8+ libqt5multimedia5-touch,
9+ libqt5multimedia5-touch-plugins,
10+ libqt5multimediaquick-p5-touch,
11+ qtdeclarative5-qtmultimedia-touch-plugin,
12+ gstreamer1.0-plugins-good,
13+ gstreamer1.0-hybris[armhf],
14+ gstreamer1.0-plugins-bad
15 Conflicts: media-player-autopilot
16 Replaces: media-player-autopilot
17 Provides: media-player-autopilot
18
19=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
20--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-09-25 21:19:34 +0000
21+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-10-01 00:36:39 +0000
22@@ -132,11 +132,19 @@
23
24 time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
25 time_label = self.main_window.get_object("Label", "TimeLine.TimeLabel")
26+
27+ """
28+ New backend work needed. bug 1231147
29 scene_selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
30+ """
31
32 """ Seek to the midle of the movie """
33 self.pointing_device.click_object(time_line)
34+
35+ """
36+ New backend work needed. bug 1231147
37 self.assertThat(scene_selector.opacity, Eventually(Equals(1)))
38+ """
39
40 """ Time label must show the current video time (diff from zero or empty) """
41 self.assertNotEqual(time_label.text, "00:00:00")
42@@ -158,7 +166,7 @@
43
44 """ avoid the test fails due the timeout """
45 self.assertThat(time_label.text, Eventually(Equals("00:00:25"), timeout=35))
46-
47+
48 controls = self.main_window.get_object("Controls", "controls")
49 self.assertProperty(controls, visible=False)
50 self.assertThat(controls.visible, Eventually(Equals(True)))

Subscribers

People subscribed via source and target branches