Merge lp:~brendan-donegan/mediaplayer-app/remove_scene_select_test into lp:mediaplayer-app
- remove_scene_select_test
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Jim Hodapp |
Approved revision: | 240 |
Merged at revision: | 247 |
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: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Jim Hodapp (community) | code | Approve | |
Leo Arias | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-07-16.
Commit message
We remove the two scene selector tests because this feature is dropped.
Description of the change
We remove the two scene selector tests because this feature is dropped.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Leo Arias (elopio) : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : 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:/
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Leo Arias (elopio) wrote : Posted in a previous version of this proposal | # |
crazy jenkins error. Running again.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:239
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : 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:/
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Leo Arias (elopio) wrote : 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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Brendan Donegan (brendan-donegan) wrote : 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:/
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
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jim Hodapp (jhodapp) wrote : Posted in a previous version of this proposal | # |
Looks good.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Leo Arias (elopio) wrote : Posted in a previous version of this proposal | # |
Just a new resubmit to avoid the conflict with Barry's branch.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
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:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:240
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jim Hodapp (jhodapp) : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jim Hodapp (jhodapp) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:240
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py' |
2 | --- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-07-18 20:34:54 +0000 |
3 | +++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-07-18 20:34:54 +0000 |
4 | @@ -69,55 +69,6 @@ |
5 | self.assertProperty(player, playing=True, paused=False) |
6 | self.assertProperty(playback_button, icon="pause") |
7 | |
8 | - @skip("New backend work needed. bug 1231147") |
9 | - def test_scene_selector_visibility(self): |
10 | - self.show_controls() |
11 | - self.pause_video() |
12 | - |
13 | - scene_selector = self.main_window.get_scene_selector() |
14 | - slider = self.main_window.get_slider() |
15 | - |
16 | - # Default state is hide |
17 | - self.assertProperty(scene_selector, visible=False) |
18 | - |
19 | - # Scene selector must apper when clicking int the slider handler |
20 | - self.pointing_device.click_object(slider) |
21 | - self.assertProperty(scene_selector, visible=True) |
22 | - |
23 | - # click again must dismiss the scene selector |
24 | - self.pointing_device.click() |
25 | - self.assertProperty(scene_selector, visible=False) |
26 | - |
27 | - @skip("fails on touch and is not reliable on different screen resolutions. bug 1183245") |
28 | - def test_scene_selector_operation(self): |
29 | - self.show_controls() |
30 | - self.pause_video() |
31 | - |
32 | - slider = self.main_window.get_slider() |
33 | - time_line = self.main_window.get_timeline() |
34 | - selector = self.main_window.get_scene_selector() |
35 | - self.assertThat(selector.count, Eventually(GreaterThan(3))) |
36 | - |
37 | - # Show scene selector |
38 | - self.pointing_device.click_object(slider) |
39 | - |
40 | - # Make sure that the scenes are in correct place |
41 | - scene_0 = self.main_window.get_scene_0() |
42 | - selectorRect = selector.globalRect |
43 | - self.pointing_device.drag( |
44 | - selectorRect[0], selectorRect[1] + selectorRect[3] // 2, |
45 | - selectorRect[0] + selectorRect[2], |
46 | - selectorRect[1] + selectorRect[3] // 2) |
47 | - self.assertThat(selector.moving, Eventually(Equals(False))) |
48 | - self.assertThat(scene_0.x, Eventually(Equals(0))) |
49 | - |
50 | - # Click in the second scene |
51 | - scene_2 = self.main_window.get_scene_2() |
52 | - self.assertThat(scene_2.ready, Eventually(Equals(True))) |
53 | - self.pointing_device.click_object(scene_2) |
54 | - self.assertThat(selector.currentIndex, Eventually(Equals(2))) |
55 | - self.assertProperty(time_line, value=1.107) |
56 | - |
57 | @skipIf(model() in ('Nexus 4', 'Galaxy Nexus'), |
58 | 'Screen width not enough for seekbar') |
59 | def test_time_display_behavior(self): |
FAILED: Continuous integration, rev:239 jenkins. qa.ubuntu. com/job/ mediaplayer- app-ci/ 200/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/1947 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 1627 jenkins. qa.ubuntu. com/job/ mediaplayer- app-utopic- amd64-ci/ 8 jenkins. qa.ubuntu. com/job/ mediaplayer- app-utopic- armhf-ci/ 8 jenkins. qa.ubuntu. com/job/ mediaplayer- app-utopic- armhf-ci/ 8/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mediaplayer- app-utopic- i386-ci/ 8 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/2195 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/3059 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/3059/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 9795 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 1363 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/1830 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/1830/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mediaplayer -app-ci/ 200/rebuild
http://