Merge lp:~ted/hud/disable-unused-tests into lp:hud/13.10

[Ted Gould]

Remove unused test and cleanup dependencies

The dbus message count test is unused and adds a bunch of dependencies that makes HUD hard to build on the phone. Let's fix that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/hud-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-raring-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-raring-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/hud/disable-unused-tests]

265. By Ted Gould on 2013-06-03

Dbus test runner packaging still broken, someone should fix that.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/hud-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/36/rebuild

review: Approve (continuous-integration)

[lp:~ted/hud/disable-unused-tests]

266. By Ted Gould on 2013-06-03

Alphabetical order is hard

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/hud-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/37/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-05-21 01:03:09 +0000
+++ debian/control	2013-06-03 16:41:27 +0000
@@ -4,7 +4,6 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: bamfdaemon,
                cmake,
-               bustle,
                dbus-test-runner,
                debhelper (>= 9),
                dh-autoreconf,
@@ -14,11 +13,7 @@
                gobject-introspection,
                gtester2xunit,
                gtk-doc-tools,
-               indicator-application (>= 0.4.90),
-               indicator-appmenu,
-               indicator-appmenu-tools,
                intltool,
-               libappindicator3-dev,
                libbamf3-dev (>= 0.2.53) [!armhf],
                libubuntu-platform-api1-dev [armhf],
                libdbusmenu-glib-dev (>= 0.5.90),
@@ -29,7 +24,6 @@
                libgirepository1.0-dev,
                libgtk-3-dev,
                libsqlite3-dev,
-               metacity,
                sqlite3,
                valac-0.18,
                xvfb,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-05-14 14:50:59 +0000
+++ tests/CMakeLists.txt	2013-06-03 16:41:27 +0000
@@ -178,7 +178,6 @@
 #test-bad-app-info-missing-menus
 #test-bad-app-info-multiple-menus
 #test-good-app-info-tons-of-entries
-#test-dbus-message-count
 
 ####################################
 # Voice tests (needs working pulse)

=== removed file 'tests/test-dbus-message-count.in'
--- tests/test-dbus-message-count.in	2013-03-25 21:16:02 +0000
+++ tests/test-dbus-message-count.in	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-export DISPLAY=
-
-. @srcdir@/run-xvfb.sh
-
-dbus-test-runner \
-	--max-wait 10 \
-	-b @builddir@/test-dbus-message-count.bustle \
-	--task /usr/bin/metacity --task-name metacity \
-	--task /usr/lib/bamf/bamfdaemon --task-name bamf \
-	--task @top_builddir@/src/hud-service --task-name hud --wait-for org.ayatana.bamf \
-	--task /usr/lib/libindicator/indicator-loader3 --parameter @indicatordir@/libappmenu.so --task-name appmenu --wait-for org.ayatana.bamf \
-	--task @mockjsonapp@ --parameter @srcdir@/test-dbus-message-count.json --wait-for com.canonical.AppMenu.Registrar --task-name app \
-	--task @srcdir@/test-dbus-message-count-send-query --wait-for com.canonical.AppMenu.Registrar --task-name query
-
-sleep 1
-
-if which bustle; then
-    bustle --count test-dbus-message-count.bustle
-fi