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

Proposed by Robert Bruce Park
Status: Rejected
Rejected by: Ricardo Salveti
Proposed branch: lp:~robru/mediaplayer-app/fix-1231418
Merge into: lp:mediaplayer-app
Diff against target: 61 lines (+17/-3)
2 files modified
debian/control (+8/-2)
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+9/-1)
To merge this branch: bzr merge lp:~robru/mediaplayer-app/fix-1231418
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Robert Bruce Park (community) Approve
Renato Araujo Oliveira Filho Pending
Review via email: mp+188502@code.launchpad.net

Commit message

Fix build issues with Renato's test fixes.

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
Robert Bruce Park (robru) wrote :

Those failures just look like DNS issues to me.

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)
Revision history for this message
Robert Bruce Park (robru) wrote :
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
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
Ricardo Salveti (rsalveti) wrote :

We don't need the extra dependencies as we still want to test the old stack (qtmultimedia + gst0.10) in the desktop use case.

And we should be fine with the test cases as well (we're also investigating the remaining issues separately).

Closing this MR for now.

Unmerged revisions

148. By Robert Bruce Park

Arch any, should fix https://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/107/console

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
1=== modified file 'debian/control'
2--- debian/control 2013-09-25 23:08:08 +0000
3+++ debian/control 2013-10-01 03:15:48 +0000
4@@ -36,16 +36,22 @@
5 A QML Media player service used by Ubuntu shell to play video sources.
6
7 Package: mediaplayer-app-autopilot
8-Architecture: all
9+Architecture: any
10 Depends: ${misc:Depends},
11 ${shlibs:Depends},
12 libautopilot-qt,
13 libqt5test5,
14 libqt5widgets5,
15 mediaplayer-app (>= ${source:Version}),
16+ libqt5multimedia5-touch,
17+ libqt5multimedia5-touch-plugins,
18+ libqt5multimediaquick-p5-touch,
19+ qtdeclarative5-qtmultimedia-touch-plugin,
20+ gstreamer1.0-plugins-good,
21+ gstreamer1.0-hybris[armhf],
22+ gstreamer1.0-plugins-bad
23 Conflicts: media-player-autopilot
24 Replaces: media-player-autopilot
25 Provides: media-player-autopilot
26 Description: Test package for mediaplayer-app
27 Autopilot tests for the mediaplayer-app package
28-
29
30=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
31--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-09-25 21:19:34 +0000
32+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-10-01 03:15:48 +0000
33@@ -132,11 +132,19 @@
34
35 time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
36 time_label = self.main_window.get_object("Label", "TimeLine.TimeLabel")
37+
38+ """
39+ New backend work needed. bug 1231147
40 scene_selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
41+ """
42
43 """ Seek to the midle of the movie """
44 self.pointing_device.click_object(time_line)
45+
46+ """
47+ New backend work needed. bug 1231147
48 self.assertThat(scene_selector.opacity, Eventually(Equals(1)))
49+ """
50
51 """ Time label must show the current video time (diff from zero or empty) """
52 self.assertNotEqual(time_label.text, "00:00:00")
53@@ -158,7 +166,7 @@
54
55 """ avoid the test fails due the timeout """
56 self.assertThat(time_label.text, Eventually(Equals("00:00:25"), timeout=35))
57-
58+
59 controls = self.main_window.get_object("Controls", "controls")
60 self.assertProperty(controls, visible=False)
61 self.assertThat(controls.visible, Eventually(Equals(True)))

Subscribers

People subscribed via source and target branches