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

[Allan LeSage]

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

[Mathieu Trudel-Lapierre (cyphermox)]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/ido-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./build=pbuilder,distribution=raring,flavor=amd64/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./build=pbuilder,distribution=raring,flavor=i386/21/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ido-ci/21//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/ido-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./build=pbuilder,distribution=raring,flavor=amd64/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./build=pbuilder,distribution=raring,flavor=i386/22/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ido-ci/22//rebuild/?

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

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)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ido-autolanding/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-autolanding/./build=pbuilder,distribution=coverity-raring,flavor=amd64/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-autolanding/./build=pbuilder,distribution=raring,flavor=i386/12/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/ido-autolanding/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-autolanding/./build=pbuilder,distribution=raring,flavor=i386/13/console

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

Attempting one more landing. . . .

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 15:40:53 +0000
+++ debian/changelog	2012-12-17 22:49:20 +0000
@@ -20,7 +20,13 @@
   [ Didier Roche ]
   * Automatic snapshot from revision 118 (bootstrap)
 
- -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 19 Nov 2012 14:00:05 -0500
+  [ Allan LeSage ]
+  * debian/rules:
+    - Remove xvfb auto_test override which caused Jenkins failures.
+  * debian/control:
+    - Remove xvfb from Build-Depends.
+
+ -- Allan LeSage <[e-mail]>  Mon, 17 Dec 2012 16:44:20 -0600
 
 ido (12.10.2-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-12-05 15:40:53 +0000
+++ debian/control	2012-12-17 22:49:20 +0000
@@ -7,7 +7,6 @@
                gnome-common,
                libxorg-gtest-dev,
                libgtest-dev,
-               xvfb,
                libglib2.0-dev (>=2.14.0),
                libgtk-3-dev (>= 3.0),
                gtk-doc-tools,

=== modified file 'debian/rules'
--- debian/rules	2012-12-05 15:40:53 +0000
+++ debian/rules	2012-12-17 22:49:20 +0000
@@ -11,6 +11,3 @@
 override_dh_install:
 	find debian/tmp/usr/lib -name *.la -delete
 	dh_install --fail-missing
-
-override_dh_auto_test:
-	xvfb-run dh_auto_test