aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-07-15 09:00:15 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-07-15 09:00:15 -0400
commit2801a022058b7ea507972a4227b5ba4433f06843 (patch)
tree5cd2eef07f21b5d86ad37b25f86d820672e81367 /tests
parentb414e0f54fb79b8131f13eb30a7d4e3e33c60472 (diff)
parent8641c27434f27843185299a6c76e70f2e87ff5d9 (diff)
downloadlibayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.tar.gz
libayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.tar.bz2
libayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.zip
* New upstream release.
* Fix signals with NULL entries in the loader * Adding a comment for setting up debugging options * Adding annotations for GIR files * Fixing watchers hashtable to detect when we have none * Fix testing so no tests are XFAIL anymore * Adding a replace mode for testing indicator services * Watching new services when the name switches
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am6
-rw-r--r--tests/Makefile.in6
-rw-r--r--tests/session.conf.in2
3 files changed, 3 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e78ac6b..f11a9d1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -258,8 +258,6 @@ service-manager-connect-tester: service-manager-connect service-manager-connect-
TESTS += service-manager-connect-tester
DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service
-# Bug 806690
-XFAIL_TESTS += service-manager-connect-tester
#############################
# Service Versions
@@ -323,8 +321,6 @@ service-version-tester: service-version-manager service-version-bad-service serv
TESTS += service-version-tester
DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service
-# Bug 806691
-XFAIL_TESTS += service-version-tester
#############################
# Service Versions
@@ -382,8 +378,6 @@ service-version-multiwatch-tester: service-version-multiwatch-manager service-ve
TESTS += service-version-multiwatch-tester
DISTCLEANFILES += service-version-multiwatch-tester
-# Bug 806692
-XFAIL_TESTS += service-version-multiwatch-tester
#############################
# Service Manager Shutdown
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e45b6f7..25e8106 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -34,6 +34,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+XFAIL_TESTS =
check_PROGRAMS = test-loader$(EXEEXT) test-desktop-shortcuts$(EXEEXT) \
service-shutdown-timeout$(EXEEXT) \
service-manager-no-connect$(EXEEXT) \
@@ -447,11 +448,6 @@ DISTCLEANFILES = test-desktop-shortcuts-tester \
service-version-multiwatch-tester \
service-manager-connect-nostart-tester loader-tester \
$(XML_REPORT) $(HTML_REPORT)
-# Bug 806690
-# Bug 806691
-# Bug 806692
-XFAIL_TESTS = service-manager-connect-tester service-version-tester \
- service-version-multiwatch-tester
lib_LTLIBRARIES = \
libdummy-indicator-blank.la \
libdummy-indicator-null.la \
diff --git a/tests/session.conf.in b/tests/session.conf.in
index d1e2805..5c0cf36 100644
--- a/tests/session.conf.in
+++ b/tests/session.conf.in
@@ -1,6 +1,8 @@
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
+ <type>session</type>
+
<!-- If we fork, keep the user's original umask to avoid affecting
the behavior of child processes. -->
<keep_umask/>