Merge lp:~mterry/hud/optional-bustle into lp:hud/13.04

[Michael Terry]

Don't require bustle and gtester2xunit for building or testing.

HUD shouldn't need bustle and gtester2xunit just for optional bits of its tests. They are difficult packages to MIR, so just don't use them if not available.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/hud-ci/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-ci/./build=pbuilder,distribution=raring,flavor=amd64/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-ci/./build=pbuilder,distribution=raring,flavor=i386/27/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[Ted Gould (ted)]

So this has now broken the daily builds as the test results, which are xunit, aren't available:

https://jenkins.qa.ubuntu.com/job/hud-daily/build=pbuilder,distribution=raring,flavor=i386/

The bustle results are used to do the performance testing which is still on the TODO list, but we'd also like to get into Jenkins as well.

[Michael Terry (mterry)]

I thought the jenkins builds included the extra packages (vs the PPA builds which don't). I believe fginther set that up. Maybe a job is just misconfigured.

[Ted Gould (ted)]

On Thu, 2013-02-28 at 03:36 +0000, Michael Terry wrote:

> I thought the jenkins builds included the extra packages (vs the PPA builds which don't). I believe fginther set that up. Maybe a job is just misconfigured.

They could, but it seems like what we really want is Jenkins to work as
closely to the same as the PPA builders. If they're different I'm not
sure that we're doing good testing.

[Michael Terry (mterry)]

Agreed in principle. But until bustle is in main (which is unlikely to happen as long as it's written in haskell), this is the best we can do for ya.

Could you perhaps get the same results without using bustle?

[Ted Gould (ted)]

On Thu, 2013-02-28 at 15:37 +0000, Michael Terry wrote:

> Agreed in principle. But until bustle is in main (which is unlikely to happen as long as it's written in haskell), this is the best we can do for ya.
>
> Could you perhaps get the same results without using bustle?

Sure, Bustle isn't as much a problem as gtester2xunit is. I think we
can work around bustle, but probably not the other.

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-20 02:01:55 +0000
+++ debian/changelog	2013-02-21 09:55:29 +0000
@@ -1,3 +1,15 @@
+hud (13.04.0daily13.02.20-0ubuntu2) raring; urgency=low
+
+  * debian/control:
+    - Remove some Build-Depends that aren't in main yet and are used for the
+      test suite.  We'll add tests back very soon as dep8 or without
+      bustle.  This is just a brown-paper-bag release to fix component
+      mismatch.
+  * debian/hud-tools.install:
+    - Don't ship hud-gtk stuff, since that's only built when tests are.
+
+ -- Michael Terry <[e-mail]>  Wed, 20 Feb 2013 17:49:47 +0000
+
 hud (13.04.0daily13.02.20-0ubuntu1) raring; urgency=low
 
   [ Ted Gould ]

=== modified file 'debian/control'
--- debian/control	2013-01-24 16:46:58 +0000
+++ debian/control	2013-02-21 09:55:29 +0000
@@ -21,9 +21,7 @@
                indicator-appmenu,
                bamfdaemon,
                gnome-doc-utils,
-               bustle (>= 0.4.2),
                dbus-test-runner,
-               gtester2xunit,
                metacity,
                sqlite3,
                valac-0.18,

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-11-29 21:23:48 +0000
+++ tests/Makefile.am	2013-02-21 09:55:29 +0000
@@ -27,7 +27,7 @@
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
 	@echo gtester --verbose -k -o $(DISTANCE_XML_REPORT) $(builddir)/test-distance >> $@
-	@echo gtester2xunit $(DISTANCE_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(DISTANCE_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 test_distance_SOURCES = \
@@ -65,7 +65,7 @@
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
 	@echo gtester --verbose -k -o $(RESULT_XML_REPORT) $(builddir)/test-result-highlighting >> $@
-	@echo gtester2xunit $(RESULT_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(RESULT_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 test_result_highlighting_SOURCES = \
@@ -110,7 +110,7 @@
 	@echo gtester --verbose -k -o $(abs_builddir)/$(USAGE_DB_SIMPLE_XML_REPORT) $(abs_builddir)/test-usage-db-simple >> $@
 	@echo cd .. >> $@
 	@echo rm -rf test-usage-db-simple.dir.\* >> $@
-	@echo gtester2xunit $(abs_builddir)/$(USAGE_DB_SIMPLE_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(abs_builddir)/$(USAGE_DB_SIMPLE_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 test_usage_db_simple_SOURCES = \
@@ -158,7 +158,7 @@
 	@echo gtester --verbose -k -o $(abs_builddir)/$(USAGE_DB_OLD_XML_REPORT) $(abs_builddir)/test-usage-db-old >> $@
 	@echo cd .. >> $@
 	@echo rm -rf test-usage-db-old.dir.\* >> $@
-	@echo gtester2xunit $(abs_builddir)/$(USAGE_DB_OLD_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(abs_builddir)/$(USAGE_DB_OLD_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 test_usage_db_old_SOURCES = \
@@ -254,7 +254,7 @@
 	@echo gtester --verbose -k -o $(abs_builddir)/$(USAGE_TESTAPP_XML_REPORT) $(abs_builddir)/test-usage-db-testapp >> $@
 	@echo cd .. >> $@
 	@echo rm -rf test-usage-db-testapp.dir.\* >> $@
-	@echo gtester2xunit $(abs_builddir)/$(USAGE_TESTAPP_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(abs_builddir)/$(USAGE_TESTAPP_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 test_usage_db_testapp_SOURCES = \
@@ -303,7 +303,7 @@
 	@echo test \! -e indicator-appmenu/hud-usage-log.sqlite >> $@
 	@echo cd .. >> $@
 	@echo rm -rf test-usage-db-off.dir.\* >> $@
-	@echo gtester2xunit $(abs_builddir)/$(USAGE_OFF_XML_REPORT) >> $@
+	@echo "if which gtester2xunit; then gtester2xunit $(abs_builddir)/$(USAGE_OFF_XML_REPORT); fi" >> $@
 	@chmod +x $@
 
 DISTCLEANFILES += \

=== modified file 'tests/test-dbus-message-count.in'
--- tests/test-dbus-message-count.in	2012-12-12 18:10:51 +0000
+++ tests/test-dbus-message-count.in	2013-02-21 09:55:29 +0000
@@ -15,4 +15,6 @@
 	--task @srcdir@/test-dbus-message-count-send-query --wait-for com.canonical.AppMenu.Registrar --task-name query
 
 sleep 1
-bustle --count test-dbus-message-count.bustle
+if which bustle; then
+    bustle --count test-dbus-message-count.bustle
+fi