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

[Omer Akram]

.ogg file is not playing due to some reason, encode to mp4

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/183/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/39
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4331
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3842
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6128
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5210

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

review: Needs Fixing (continuous-integration)

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

212. By Omer Akram on 2014-03-25

fail the tests if the sample video is not played due to some reason

213. By Omer Akram on 2014-03-25

remove debug prints

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/184/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3841/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3843/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

213. By Omer Akram on 2014-03-25

remove debug prints

212. By Omer Akram on 2014-03-25

fail the tests if the sample video is not played due to some reason

211. By Omer Akram on 2014-03-25

encode the sample video to mp4 so that it plays on the device

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2014-01-07 19:45:40 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2014-03-25 22:53:17 +0000
@@ -26,16 +26,26 @@
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestPlayerWithVideo, self).setUp()
-        self.launch_app("small.ogg")
+        self.launch_app("small.mp4")
         self.assertThat(
             self.main_window.get_qml_view().visible, Eventually(Equals(True)))
         # wait video player start
         player = self.main_window.get_player()
         self.assertThat(player.playing, Eventually(Equals(True)))
+        self._check_video_really_loaded()
 
     def tearDown(self):
         super(TestPlayerWithVideo, self).tearDown()
 
+    def _check_video_really_loaded(self):
+        slider = self.main_window.get_slider()
+            
+        self.assertNotEquals(
+            slider.maximumValue, 0.0,
+            msg='The video under test seems to have 0 seconds length, are the '
+                'required codecs installed ?'
+        )
+
     def show_controls(self):
         video_area = self.main_window.get_video_area()
         self.pointing_device.click_object(video_area)

=== modified file 'tests/videos/CMakeLists.txt'
--- tests/videos/CMakeLists.txt	2013-11-01 13:24:19 +0000
+++ tests/videos/CMakeLists.txt	2014-03-25 22:53:17 +0000
@@ -1,6 +1,6 @@
 project(sample_videos)
 
-set(MEDIAPLAYER_TEST_VIDEOS small.ogg)
+set(MEDIAPLAYER_TEST_VIDEOS small.mp4)
 
 install(FILES ${MEDIAPLAYER_TEST_VIDEOS}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/mediaplayer-app/videos

=== added file 'tests/videos/small.mp4'
Binary files tests/videos/small.mp4	1970-01-01 00:00:00 +0000 and tests/videos/small.mp4	2014-03-25 22:53:17 +0000 differ
=== removed file 'tests/videos/small.ogg'
Binary files tests/videos/small.ogg	2013-11-01 13:24:19 +0000 and tests/videos/small.ogg	1970-01-01 00:00:00 +0000 differ