mediaplayer-app

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

remove_scene_select_test
Merge into trunk

Proposed by Brendan Donegan on 2014-07-16

Status:	Superseded
Proposed branch:	lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test
Merge into:	lp:mediaplayer-app
Prerequisite:	lp:~barry/mediaplayer-app/py3autopilot
Diff against target:	59 lines (+0/-49) (has conflicts) 1 file modified tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+0/-49) Text conflict in debian/changelog
To merge this branch:	bzr merge lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jim Hodapp (community)	code	2014-07-16	Approve on 2014-07-18
PS Jenkins bot	continuous-integration	2014-07-16	Needs Fixing on 2014-07-17
Leo Arias (community)		2014-07-16	Approve on 2014-07-16
Review via email: mp+227071@code.launchpad.net

This proposal supersedes a proposal from 2014-07-15.

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

Commit message

Remove scene selector tests as they are no longer valid

Description of the change

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

Revision history for this message

Leo Arias (elopio) on 2014-07-14: Posted in a previous version of this proposal

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:239
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brendan-donegan/mediaplayer-app/remove_scene_select_test/+merge/226863/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-15: Posted in a previous version of this proposal

crazy jenkins error. Running again.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2040
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9895
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1919/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15: Posted in a previous version of this proposal

http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2043
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3171
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9897
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1921
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1921/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-16: Posted in a previous version of this proposal

The only error is the test that's skipped on the prerequisite.
This is good to go.
Brendan, please fill the MP submission checklist:
https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps

review: Approve

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-07-16: Posted in a previous version of this proposal

Are there any related MPs required for this MP to build/function as expected? Please list.

lp:~canonical-platform-qa/mediaplayer-app/fix1341956-test_no_video

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

no application functionality changed

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

no, application not changed

If you changed the UI, was the change specified/approved by design?

ui not changed

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

packaging not changed

Revision history for this message

Jim Hodapp (jhodapp) wrote on 2014-07-16: Posted in a previous version of this proposal

Looks good.

review: Approve (code)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-16:

Just a new resubmit to avoid the conflict with Barry's branch.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-17:

FAILED: Continuous integration, rev:240
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brendan-donegan/mediaplayer-app/remove_scene_select_test/+merge/227071/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Jim Hodapp (jhodapp) on 2014-07-18:

review: Approve (code)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brendan Donegan

Ubuntu Phablet Team

 === modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
 --- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2014-07-16 16:52:40 +0000
 +++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2014-07-16 16:52:40 +0000
@@ -69,55 +69,6 @@
          self.assertProperty(player, playing=True, paused=False)
          self.assertProperty(playback_button, icon="pause")
--    @skip("New backend work needed. bug 1231147")
--    def test_scene_selector_visibility(self):
--        self.show_controls()
--        self.pause_video()
--
--        scene_selector = self.main_window.get_scene_selector()
--        slider = self.main_window.get_slider()
--
--        # Default state is hide
--        self.assertProperty(scene_selector, visible=False)
--
--        # Scene selector must apper when clicking int the slider handler
--        self.pointing_device.click_object(slider)
--        self.assertProperty(scene_selector, visible=True)
--
--        # click again must dismiss the scene selector
--        self.pointing_device.click()
--        self.assertProperty(scene_selector, visible=False)
--
--    @skip("fails on touch and is not reliable on different screen resolutions. bug 1183245")
--    def test_scene_selector_operation(self):
--        self.show_controls()
--        self.pause_video()
--
--        slider = self.main_window.get_slider()
--        time_line = self.main_window.get_timeline()
--        selector = self.main_window.get_scene_selector()
--        self.assertThat(selector.count, Eventually(GreaterThan(3)))
--
--        # Show scene selector
--        self.pointing_device.click_object(slider)
--
--        # Make sure that the scenes are in correct place
--        scene_0 = self.main_window.get_scene_0()
--        selectorRect = selector.globalRect
--        self.pointing_device.drag(
--            selectorRect[0], selectorRect[1] + selectorRect[3] // 2,
--            selectorRect[0] + selectorRect[2],
--            selectorRect[1] + selectorRect[3] // 2)
--        self.assertThat(selector.moving, Eventually(Equals(False)))
--        self.assertThat(scene_0.x, Eventually(Equals(0)))
--
--        # Click in the second scene
--        scene_2 = self.main_window.get_scene_2()
--        self.assertThat(scene_2.ready, Eventually(Equals(True)))
--        self.pointing_device.click_object(scene_2)
--        self.assertThat(selector.currentIndex, Eventually(Equals(2)))
--        self.assertProperty(time_line, value=1.107)
--
      @skipIf(model() in ('Nexus 4', 'Galaxy Nexus'),
              'Screen width not enough for seekbar')
      def test_time_display_behavior(self):