Merge lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

[Omer Akram]

Run unittests during build, disable flaky tests

Run unittests during build, disable flaky tests

[Dmitry Shachnev (mitya57)]

Thanks for working on it!

> cd tests/auto/unit/ && ( test -e Makefile || qmake unit.pro -o Makefile ) && make -f Makefile check

That looks quite complicated. Take a look at i.e. qtsvg, where a simple dh_auto_test worked (though we explicitly told qmake to enable tests).

dh_auto_test is usually better because it takes care of things like DEB_BUILD_OPTIONS=nocheck.

P.S. Special thanks for adding bug numbers (though you may also want to use the DEP-3 format).

review: Abstain

[Timo Jyrinki (timo-jyrinki)]

I'm fine with this approach since it's hard to find a subset of truly functional tests that run on builders, so this seems to make enough sense.

I'll run a test build and then merge later.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

But unfortunately does not work when tested in PPA build, see:

https://launchpadlibrarian.net/159472661/buildlog_ubuntu-trusty-amd64.qtmultimedia-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test3_FAILEDTOBUILD.txt.gz

review: Needs Fixing

[Omer Akram (om26er)]

Can you please suggest a way to reproduce that environment. I tried a 'debuild' locally and it worked fine.

[lp:~om26er/kubuntu-packaging/qtmultimedia_unittests]

60. By Omer Akram on 2013-12-16

remove previous patch

61. By Omer Akram on 2013-12-16

add a single patch to disable failing tests

62. By Omer Akram on 2013-12-16

merge trunk

[Omer Akram (om26er)]

The patch is now DEP3 compilant. Also fixed the failure that Timo reported. All the tests pass during build now. However the package still fails to build but that's not related to any of my changes rather a packaging issue.

[Omer Akram (om26er)]

Full build logs of failure here: http://paste.ubuntu.com/6583508/

[Timo Jyrinki (timo-jyrinki)]

Builds fine in a PPA, thanks! Merged with attribution.

https://launchpadlibrarian.net/160003668/buildlog_ubuntu-trusty-amd64.qtmultimedia-opensource-src_5.2.0-1ubuntu1~trusty1~test1_UPLOADING.txt.gz

review: Approve

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-12-16 13:50:15 +0000
@@ -0,0 +1,1 @@
+skip_failing_tests.patch

=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_tests.patch	2013-12-16 13:50:15 +0000
@@ -0,0 +1,39 @@
+Title: qmediaplaylist tests are unreliable, so disable them
+Forwarded: not-needed
+Bug: https://bugreports.qt-project.org/browse/QTBUG-23826
+Bug: https://bugreports.qt-project.org/browse/QTBUG-35420
+Bug-Ubuntu: https://launchpad.net/bugs/1261384
+Author: Omer Akram <[e-mail]>
+
+=== modified file 'tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp'
+--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-09-20 19:21:01 +0000
++++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-12-05 16:30:52 +0000
+@@ -341,6 +341,7 @@
+ 
+ void tst_QMediaPlaylist::saveAndLoad()
+ {
++    QSKIP("QTBUG-23826: test is flaky and has been like that for a while");
+     QMediaPlaylist playlist;
+     playlist.addMedia(content1);
+     playlist.addMedia(content2);
+@@ -649,6 +650,7 @@
+ 
+ void tst_QMediaPlaylist::testLoaded_signal()
+ {
++    QSKIP("QTBUG-35420 test fails at random");
+     //create an instance of QMediaPlaylist class.
+     QMediaPlaylist playlist;
+     playlist.addMedia(content1); //set the media to playlist
+
+=== modified file 'tests/auto/unit/multimedia.pro'
+--- a/tests/auto/unit/multimedia.pro	2013-05-23 19:47:12 +0000
++++ b/tests/auto/unit/multimedia.pro	2013-12-12 19:46:46 +0000
+@@ -19,7 +19,7 @@
+     qmediarecorder \
+     qmediaresource \
+     qmediaservice \
+-    qmediaserviceprovider \
++#    qmediaserviceprovider \
+     qmediatimerange \
+     qmetadatareadercontrol \
+     qmetadatawritercontrol \

=== modified file 'debian/rules'
--- debian/rules	2013-11-14 06:29:52 +0000
+++ debian/rules	2013-12-16 13:50:15 +0000
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
@@ -36,3 +37,7 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/unit/ && ( test -e Makefile || qmake unit.pro -o Makefile ) && make -f Makefile check
+