Merge lp:~michihenning/thumbnailer/disable-tests into lp:thumbnailer

Proposed by Michi Henning on 2016-09-23
Status: Merged
Approved by: Michi Henning on 2016-09-26
Approved revision: 155
Merged at revision: 150
Proposed branch: lp:~michihenning/thumbnailer/disable-tests
Merge into: lp:thumbnailer
Prerequisite: lp:~michihenning/thumbnailer/merge-crossbuild
Diff against target: 218 lines (+87/-36)
9 files modified
CMakeLists.txt (+22/-0)
debian/changelog (+22/-35)
doc/libthumbnailer-qt/examples/qt_example_test.cpp (+7/-0)
tests/dbus/dbus_test.cpp (+7/-0)
tests/image-provider/image-provider_test.cpp (+7/-0)
tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+7/-0)
tests/qml/qml_test.cpp (+7/-0)
tests/slow-vs-thumb/slow-vs-thumb_test.cpp (+1/-1)
tests/stress/stress_test.cpp (+7/-0)
To merge this branch: bzr merge lp:~michihenning/thumbnailer/disable-tests
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve on 2016-09-26
James Henstridge Approve on 2016-09-23
Timo Jyrinki 2016-09-23 Needs Information on 2016-09-23
Review via email: mp+306566@code.launchpad.net

Commit message

Disabled QDBus-related tests on xenial and yakkety for the time being due to problems with Qt 5.6. See
    https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561
    https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930

Description of the change

Disabled QDBus-related tests on xenial and yakkety for the time being due to problems with Qt 5.6. See
    https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561
    https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Looks good otherwise, but why on xenial, as they pass there?

review: Needs Information
Michi Henning (michihenning) wrote :

Timo: They don't pass on xenial. Had a failure yesterday on xenial too.

Timo Jyrinki (timo-jyrinki) wrote :

Ok, but just flakiness? Trainguards and core-devs can retry them easily. I mean, they are possible to get to pass on xenial+overlay like https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/1969/+packages (succeeded on first try) but always failing on yakkety so there's a difference.

But as you wish, just commented when noticed.

Michi Henning (michihenning) wrote :

This bug has "race condition" written all over it. We've seen this fail on yakkity, and once on xenial on powerpc (where it has never failed in yakkity so far).

I'm not really interested in trying to keep these tests running just in case that they make it through by accident, only to fail again at some other inconvenient point in time.

We'll make it a priority to try and re-enable the tests ASAP. But, for now, and to unblock unity8, I want to be sure that there are no more glitches or surprises.

James Henstridge (jamesh) wrote :

Yep. The common factor is Qt 5.6, which is shared by xenial+overlay and yakkety.

review: Approve
Michi Henning (michihenning) wrote :

Re-approving because James is on leave.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-07-18 14:55:34 +0000
3+++ CMakeLists.txt 2016-09-26 02:39:33 +0000
4@@ -82,6 +82,28 @@
5 add_definitions(-DSLOW_TESTS=0)
6 endif()
7
8+# TODO: Hack to allow disabling tests that need QDBus on xenial and yakkety,
9+# due to broken Qt 5.6. Re-enable tests ASAP!
10+option(skip-dbus-tests "Skip DBus tests" ON)
11+if (${skip-dbus-tests})
12+ execute_process(COMMAND lsb_release -s -c OUTPUT_VARIABLE distro OUTPUT_STRIP_TRAILING_WHITESPACE)
13+ execute_process(COMMAND uname -m OUTPUT_VARIABLE arch OUTPUT_STRIP_TRAILING_WHITESPACE)
14+ message("DISTRO: ${distro}")
15+ message("ARCH: ${arch}")
16+ if (
17+ (${distro} STREQUAL "xenial" OR ${distro} STREQUAL "yakkety")
18+ AND
19+ (${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "ppc" OR ${arch} STREQUAL "ppc64le")
20+ )
21+ message(WARNING "WARNING: Disabling DBus-related tests for ${distro}
22+ See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561
23+ https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930")
24+ add_definitions(-DSKIP_DBUS_TESTS=1)
25+ add_definitions(-DDISTRO=\"${distro}\")
26+ add_definitions(-DARCH=\"${arch}\")
27+ endif()
28+endif()
29+
30 # Definitions for testing with valgrind.
31
32 configure_file(CTestCustom.cmake.in CTestCustom.cmake) # Tests in CTestCustom.cmake are skipped for valgrind
33
34=== modified file 'debian/changelog'
35--- debian/changelog 2016-09-26 02:39:33 +0000
36+++ debian/changelog 2016-09-26 02:39:33 +0000
37@@ -1,38 +1,25 @@
38-<<<<<<< TREE
39-thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
40-
41- * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
42- * Relaxed copyright for trace.cpp and trace.h to LGPL.
43-
44- -- Michi Henning <michi@triodia.com> Thu, 25 Aug 2016 06:59:02 +0000
45-
46-thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
47-
48- * No-change rebuild for boost soname change.
49-
50- -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:32:55 +0000
51-
52-=======
53-thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
54-
55- * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
56- * Relaxed copyright for trace.cpp and trace.h to LGPL.
57-
58- -- Michi Henning <michi@triodia.com> Thu, 25 Aug 2016 06:59:02 +0000
59-
60-thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
61-
62- * No-change rebuild for boost soname change.
63-
64- -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:32:55 +0000
65-
66-thumbnailer (2.4) UNRELEASED; urgency=medium
67-
68- * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
69-
70- -- Michi Henning <michi.henning@canonical.com> Mon, 25 Jul 2016 10:56:23 +1000
71-
72->>>>>>> MERGE-SOURCE
73+thumbnailer (2.4+16.10.20160825-0ubuntu2) UNRELEASED; urgency=medium
74+
75+ * Disabled QDBus-related tests on xenial and yakkety for the time being due
76+ to problems with Qt 5.6. See
77+ https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561
78+ https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930
79+
80+ -- Michi Henning <michi.henning@canonical.com> Fri, 23 Sep 2016 14:08:49 +1000
81+
82+thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
83+
84+ * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
85+ * Relaxed copyright for trace.cpp and trace.h to LGPL.
86+
87+ -- Michi Henning <michi@triodia.com> Thu, 25 Aug 2016 06:59:02 +0000
88+
89+thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
90+
91+ * No-change rebuild for boost soname change.
92+
93+ -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:32:55 +0000
94+
95 thumbnailer (2.4+16.10.20160719-0ubuntu1) yakkety; urgency=medium
96
97 [ Michi Henning ]
98
99=== modified file 'doc/libthumbnailer-qt/examples/qt_example_test.cpp'
100--- doc/libthumbnailer-qt/examples/qt_example_test.cpp 2015-12-12 02:06:41 +0000
101+++ doc/libthumbnailer-qt/examples/qt_example_test.cpp 2016-09-26 02:39:33 +0000
102@@ -178,6 +178,13 @@
103
104 int main(int argc, char** argv)
105 {
106+#if defined(SKIP_DBUS_TESTS)
107+ // TODO: Re-enable this ASAP!
108+ cerr << "WARNING: Skipping tests on " << DISTRO << endl;
109+ cerr << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561" << endl;
110+ cerr << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930" << endl;
111+ return 0;
112+#endif
113 QCoreApplication app(argc, argv);
114 setenv("GSETTINGS_BACKEND", "memory", true);
115 setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
116
117=== modified file 'tests/dbus/dbus_test.cpp'
118--- tests/dbus/dbus_test.cpp 2016-01-04 06:09:41 +0000
119+++ tests/dbus/dbus_test.cpp 2016-09-26 02:39:33 +0000
120@@ -610,6 +610,13 @@
121
122 int main(int argc, char** argv)
123 {
124+#if defined(SKIP_DBUS_TESTS)
125+ // TODO: Re-enable this ASAP!
126+ cerr << "WARNING: Skipping tests on " << DISTRO << " " << ARCH << endl;
127+ cerr << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561" << endl;
128+ cerr << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930" << endl;
129+ return 0;
130+#endif
131 QCoreApplication app(argc, argv);
132 qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus"); // Avoid noise from signal spy.
133 qDBusRegisterMetaType<unity::thumbnailer::service::AllStats>();
134
135=== modified file 'tests/image-provider/image-provider_test.cpp'
136--- tests/image-provider/image-provider_test.cpp 2016-01-12 07:21:18 +0000
137+++ tests/image-provider/image-provider_test.cpp 2016-09-26 02:39:33 +0000
138@@ -204,6 +204,13 @@
139
140 int main(int argc, char **argv)
141 {
142+#if defined(SKIP_DBUS_TESTS)
143+ // TODO: Re-enable this ASAP!
144+ cerr << "WARNING: Skipping tests on " << DISTRO << " " << ARCH << endl;
145+ cerr << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561" << endl;
146+ cerr << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930" << endl;
147+ return 0;
148+#endif
149 QGuiApplication app(argc, argv);
150 setenv("GSETTINGS_BACKEND", "memory", true);
151 setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
152
153=== modified file 'tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp'
154--- tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp 2016-02-26 23:13:38 +0000
155+++ tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp 2016-09-26 02:39:33 +0000
156@@ -779,6 +779,13 @@
157
158 int main(int argc, char** argv)
159 {
160+#if defined(SKIP_DBUS_TESTS)
161+ // TODO: Re-enable this ASAP!
162+ cerr << "WARNING: Skipping tests on " << DISTRO << " " << ARCH << endl;
163+ cerr << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561" << endl;
164+ cerr << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930" << endl;
165+ return 0;
166+#endif
167 gst_init(&argc, &argv);
168
169 QCoreApplication app(argc, argv);
170
171=== modified file 'tests/qml/qml_test.cpp'
172--- tests/qml/qml_test.cpp 2015-12-12 02:06:41 +0000
173+++ tests/qml/qml_test.cpp 2016-09-26 02:39:33 +0000
174@@ -67,6 +67,13 @@
175
176 int main(int argc, char** argv)
177 {
178+#if defined(SKIP_DBUS_TESTS)
179+ // TODO: Re-enable this ASAP!
180+ qDebug() << "WARNING: Skipping tests on" << DISTRO << " " << ARCH << endl;
181+ qDebug() << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561";
182+ qDebug() << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930";
183+ return 0;
184+#endif
185 QGuiApplication app(argc, argv);
186
187 setenv("GSETTINGS_BACKEND", "memory", true);
188
189=== modified file 'tests/slow-vs-thumb/slow-vs-thumb_test.cpp'
190--- tests/slow-vs-thumb/slow-vs-thumb_test.cpp 2016-02-02 06:29:01 +0000
191+++ tests/slow-vs-thumb/slow-vs-thumb_test.cpp 2016-09-26 02:39:33 +0000
192@@ -72,7 +72,7 @@
193
194 QSignalSpy spy(request.get(), &ThumbnailRequest::downloadFinished);
195 request->download();
196- ASSERT_TRUE(spy.wait(15000)); // Slow vs-thumb will get killed after 10 seconds.
197+ ASSERT_TRUE(spy.wait(30000)); // Slow vs-thumb will get killed after 10 seconds.
198
199 EXPECT_EQ("", request->thumbnail());
200 }
201
202=== modified file 'tests/stress/stress_test.cpp'
203--- tests/stress/stress_test.cpp 2016-02-02 03:56:15 +0000
204+++ tests/stress/stress_test.cpp 2016-09-26 02:39:33 +0000
205@@ -596,6 +596,13 @@
206
207 int main(int argc, char** argv)
208 {
209+#if defined(SKIP_DBUS_TESTS)
210+ // TODO: Re-enable this ASAP!
211+ cerr << "WARNING: Skipping tests on " << DISTRO << " " << ARCH << endl;
212+ cerr << " See https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561" << endl;
213+ cerr << " https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930" << endl;
214+ return 0;
215+#endif
216 gst_init(&argc, &argv);
217
218 QCoreApplication app(argc, argv);

Subscribers

People subscribed via source and target branches

to all changes: