Merge lp:~allanlesage/ido/remove-Xvfb-auto-test-override into lp:ido/13.04

Proposed by Allan LeSage on 2012-12-17
Status: Merged
Approved by: Allan LeSage on 2012-12-18
Approved revision: 123
Merged at revision: 121
Proposed branch: lp:~allanlesage/ido/remove-Xvfb-auto-test-override
Merge into: lp:ido/13.04
Diff against target: 41 lines (+7/-5)
3 files modified
debian/changelog (+7/-1)
debian/control (+0/-1)
debian/rules (+0/-3)
To merge this branch: bzr merge lp:~allanlesage/ido/remove-Xvfb-auto-test-override
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing on 2012-12-18
Mathieu Trudel-Lapierre 2012-12-17 Approve on 2012-12-18
Review via email: mp+140307@code.launchpad.net

Description of the change

Testing with cyphermox--removing the special Xvfb auto_test override appears to resolve flaky tests under Jenkins.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Then you'll want to also remove xvfb from debian/control Build-Depends though ;)

The tests run via xorg-gtest; so they're already supposed to start their own X server -- seems fine to me.

review: Needs Fixing
Mathieu Trudel-Lapierre (cyphermox) wrote :

It's reasonable and in line with what we want to achieve: "clean" tests that can just be called directly through dh_auto_test without extra work; approve.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Allan LeSage (allanlesage) wrote :

Attempting one more landing. . . .

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-05 15:40:53 +0000
3+++ debian/changelog 2012-12-17 22:49:20 +0000
4@@ -20,7 +20,13 @@
5 [ Didier Roche ]
6 * Automatic snapshot from revision 118 (bootstrap)
7
8- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 19 Nov 2012 14:00:05 -0500
9+ [ Allan LeSage ]
10+ * debian/rules:
11+ - Remove xvfb auto_test override which caused Jenkins failures.
12+ * debian/control:
13+ - Remove xvfb from Build-Depends.
14+
15+ -- Allan LeSage <allan.lesage@canonical.com> Mon, 17 Dec 2012 16:44:20 -0600
16
17 ido (12.10.2-0ubuntu1) quantal; urgency=low
18
19
20=== modified file 'debian/control'
21--- debian/control 2012-12-05 15:40:53 +0000
22+++ debian/control 2012-12-17 22:49:20 +0000
23@@ -7,7 +7,6 @@
24 gnome-common,
25 libxorg-gtest-dev,
26 libgtest-dev,
27- xvfb,
28 libglib2.0-dev (>=2.14.0),
29 libgtk-3-dev (>= 3.0),
30 gtk-doc-tools,
31
32=== modified file 'debian/rules'
33--- debian/rules 2012-12-05 15:40:53 +0000
34+++ debian/rules 2012-12-17 22:49:20 +0000
35@@ -11,6 +11,3 @@
36 override_dh_install:
37 find debian/tmp/usr/lib -name *.la -delete
38 dh_install --fail-missing
39-
40-override_dh_auto_test:
41- xvfb-run dh_auto_test

Subscribers

People subscribed via source and target branches