Merge lp:~om26er/mediaplayer-app/skip_if_phone into lp:mediaplayer-app

[Omer Akram]

Skip tests interacting with the seekbar as its only not visible in landscape mode on phones and we don't have a way to force landscape.

Skip tests interacting with the seekbar as its only not visible in landscape mode on phones and we don't have a way to force landscape.

[Omer Akram (om26er)]

reported bug 1184608 for the ability to force landscape mode.

[lp:~om26er/mediaplayer-app/skip_if_phone]

92. By Omer Akram on 2013-05-28

oops, forgot to import

93. By Omer Akram on 2013-05-28

fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1703

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good now.

[Renato Araujo Oliveira Filho (renatofilho)]

review: Approve

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-05-23 21:47:41 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-05-28 13:05:31 +0000
@@ -10,6 +10,8 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
+from autopilot.platform import model
+from testtools import skipIf
 from testtools.matchers import Equals, GreaterThan
 
 from unittest import skip
@@ -64,7 +66,7 @@
         self.assertProperty(player, playing=True, paused=False)
         self.assertProperty(playback_buttom, icon="pause")
 
-
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
     def test_scene_selector_visibility(self):
         self.show_controls()
         self.pause_video()
@@ -114,6 +116,7 @@
         self.assertThat(selector.currentIndex, Eventually(Equals(2)))
         self.assertProperty(time_line, value=1.107)
 
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
     def test_time_display_behavior(self):
         self.show_controls()
         self.pause_video()
@@ -141,7 +144,7 @@
         """
         self.assertEqual(time_label.text[0:9], "- 00:00:0")
 
-
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
     def test_show_controls_at_end(self):
         self.show_controls()
         time_line = self.main_window.get_object("Slider", "TimeLine.Slider")