mediaplayer-app

Merge lp:~renatofilho/mediaplayer-app/new-sdk-name into lp:mediaplayer-app

  1. new-sdk-name
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Zanetti
Approved revision: 64
Merged at revision: 62
Proposed branch: lp:~renatofilho/mediaplayer-app/new-sdk-name
Merge into: lp:mediaplayer-app
Diff against target: 53 lines (+8/-10)
2 files modified
debian/control (+2/-1)
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+6/-9)
To merge this branch: bzr merge lp:~renatofilho/mediaplayer-app/new-sdk-name
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+154491@code.launchpad.net

Commit message

Update runtime dependencies to account for the renaming of the UI toolkit package.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/186

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/1/rebuild

review: Needs Fixing (continuous-integration)
lp:~renatofilho/mediaplayer-app/new-sdk-name updated
63. By Renato Araujo Oliveira Filho

[autopilot] Make sure that the scene selector stops moving before click on scene

64. By Renato Araujo Oliveira Filho

Added 'qtmultimedia5-dev' into binary dependecy list because it contains the necessary plugin to play multimedia files.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/239

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/241/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/271

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/4/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-03-18 18:14:37 +0000
+++ debian/control 2013-03-21 20:19:21 +0000
@@ -26,7 +26,8 @@
26 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,26 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
27 qtdeclarative5-window-plugin,27 qtdeclarative5-window-plugin,
28 qtdeclarative5-xmllistmodel-plugin,28 qtdeclarative5-xmllistmodel-plugin,
29 qt-components-ubuntu,29 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
30 qtmultimedia5-dev,
30 libhud-qt-qml,31 libhud-qt-qml,
31 gstreamer0.10-ffmpeg,32 gstreamer0.10-ffmpeg,
32 gstreamer0.10-plugins-base,33 gstreamer0.10-plugins-base,
3334
=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-03-06 20:47:01 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-03-21 20:19:21 +0000
@@ -94,29 +94,26 @@
94 slider = self.main_window.get_object("Slider", "TimeLine.Slider")94 slider = self.main_window.get_object("Slider", "TimeLine.Slider")
95 time_line = self.main_window.get_object("TimeLine", "TimeLine")95 time_line = self.main_window.get_object("TimeLine", "TimeLine")
96 selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")96 selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
97 self.assertThat(selector.count, Eventually(GreaterThan(3)))97 self.assertThat(selector.count, Eventually(GreaterThan(3)))
98
99 scene_2 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene2")
100 self.assertThat(scene_2.ready, Eventually(Equals(True)))
101
10298
103 """ Show scene selector """99 """ Show scene selector """
104 self.mouse.move_to_object(slider)100 self.mouse.move_to_object(slider)
105 self.mouse.click()101 self.mouse.click()
106102
107 """ Make sure that the scenes are in correct place """103 """ Make sure that the scenes are in correct place """
104 scene_0 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene0")
108 selectorRect = selector.globalRect105 selectorRect = selector.globalRect
109 self.pointing_device.drag(selectorRect[0], selectorRect[1] + selectorRect[3] / 2,106 self.pointing_device.drag(selectorRect[0], selectorRect[1] + selectorRect[3] / 2,
110 selectorRect[0] + selectorRect[2], selectorRect[1] + selectorRect[3] / 2)107 selectorRect[0] + selectorRect[2], selectorRect[1] + selectorRect[3] / 2)
111 scene_0 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene0")108 self.assertThat(selector.moving, Eventually(Equals(False)))
112 self.assertThat(scene_0.x, Eventually(GreaterThan(-1)))109 self.assertThat(scene_0.x, Eventually(Equals(0)))
113
114110
115 """ Click in the second scene """111 """ Click in the second scene """
112 scene_2 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene2")
113 self.assertThat(scene_2.ready, Eventually(Equals(True)))
116 self.mouse.move_to_object(scene_2)114 self.mouse.move_to_object(scene_2)
117 self.mouse.click()115 self.mouse.click()
118 self.assertThat(selector.currentIndex, Eventually(Equals(2)))116 self.assertThat(selector.currentIndex, Eventually(Equals(2)))
119
120 self.assertProperty(time_line, value=1.113)117 self.assertProperty(time_line, value=1.113)
121118
122 def test_time_display_behavior(self):119 def test_time_display_behavior(self):

Subscribers

People subscribed via source and target branches