Merge lp:~thekorn/zeitgeist/fix-634740-634744-testrunner-improvements into lp:zeitgeist/0.1

[Markus Korn]

* Make sure to run all tests using its own temporary ZEITGEIST_DATA_PATH, ZEITGEIST_DATABASE set to ":memory:", and as much isolated from other tests as possible. Unfortunately this requires some lazy imports (LP: #634740)
* `make check` (or `test/run-all-tests.py`) runs all tests now on a private DBUs bus (LP: #634744)

[lp:~thekorn/zeitgeist/fix-634740-634744-testrunner-improvements]

1599. By Markus Korn on 2010-09-21

merged recent changes from lp:zeitgeist

[Seif Lotfy (seif)]

It still fails with the blacklist-test.py! I had to quit zeitgeist manually for the tests to succeed. Here is my print out.

seif@Wumbo:~/Projects/xxx/zeitgeist$ test/blacklist-test.py
EEEE
======================================================================
ERROR: testApplyBlacklist (__main__.BlacklistTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/blacklist-test.py", line 24, in setUp
    super(BlacklistTest, self).setUp()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 118, in setUp
    self.spawn_daemon()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 103, in spawn_daemon
    raise RuntimeError("Could not start daemon, got err=%i" % err)
RuntimeError: Could not start daemon, got err=1

======================================================================
ERROR: testBlacklistUsingClientDBusInterface (__main__.BlacklistTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/blacklist-test.py", line 24, in setUp
    super(BlacklistTest, self).setUp()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 118, in setUp
    self.spawn_daemon()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 103, in spawn_daemon
    raise RuntimeError("Could not start daemon, got err=%i" % err)
RuntimeError: Could not start daemon, got err=1

======================================================================
ERROR: testClear (__main__.BlacklistTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/blacklist-test.py", line 24, in setUp
    super(BlacklistTest, self).setUp()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 118, in setUp
    self.spawn_daemon()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 103, in spawn_daemon
    raise RuntimeError("Could not start daemon, got err=%i" % err)
RuntimeError: Could not start daemon, got err=1

======================================================================
ERROR: testSetOne (__main__.BlacklistTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test/blacklist-test.py", line 24, in setUp
    super(BlacklistTest, self).setUp()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 118, in setUp
    self.spawn_daemon()
  File "/home/seif/Projects/xxx/zeitgeist/test/testutils.py", line 103, in spawn_daemon
    raise RuntimeError("Could not start daemon, got err=%i" % err)
RuntimeError: Could not start daemon, got err=1

----------------------------------------------------------------------
Ran 4 tests in 4.014s

FAILED (errors=4)

[Seif Lotfy (seif)]

review: Needs Fixing

[Seif Lotfy (seif)]

Here is the full output when running test/run-all-tests.py
-----------------------------------------------------------

seif@Wumbo:~/Projects/xxx/zeitgeist$ test/run-all-tests.py
[dix] Could not init font path element /usr/share/fonts/X11/cyrillic, removing from list!
5 XSELINUXs still allocated at reset
SCREEN: 0 objects of 68 bytes = 0 total bytes 0 private allocs
DEVICE: 4 objects of 16 bytes = 64 total bytes 0 private allocs
CLIENT: 0 objects of 152 bytes = 0 total bytes 0 private allocs
WINDOW: 0 objects of 16 bytes = 0 total bytes 0 private allocs
PIXMAP: 1 objects of 8 bytes = 8 total bytes 0 private allocs
GC: 0 objects of 44 bytes = 0 total bytes 0 private allocs
CURSOR: 0 objects of 4 bytes = 0 total bytes 0 private allocs
CURSOR_BITS: 0 objects of 4 bytes = 0 total bytes 0 private allocs
DBE_WINDOW: 0 objects of 12 bytes = 0 total bytes 0 private allocs
TOTAL: 5 objects, 72 bytes, 0 allocs
4 DEVICEs still allocated at reset
DEVICE: 4 objects of 16 bytes = 64 total bytes 0 private allocs
CLIENT: 0 objects of 152 bytes = 0 total bytes 0 private allocs
WINDOW: 0 objects of 16 bytes = 0 total bytes 0 private allocs
PIXMAP: 1 objects of 8 bytes = 8 total bytes 0 private allocs
GC: 0 objects of 44 bytes = 0 total bytes 0 private allocs
CURSOR: 0 objects of 4 bytes = 0 total bytes 0 private allocs
CURSOR_BITS: 0 objects of 4 bytes = 0 total bytes 0 private allocs
DBE_WINDOW: 0 objects of 12 bytes = 0 total bytes 0 private allocs
TOTAL: 5 objects, 72 bytes, 0 allocs
1 PIXMAPs still allocated at reset
PIXMAP: 1 objects of 8 bytes = 8 total bytes 0 private allocs
GC: 0 objects of 44 bytes = 0 total bytes 0 private allocs
CURSOR: 0 objects of 4 bytes = 0 total bytes 0 private allocs
CURSOR_BITS: 0 objects of 4 bytes = 0 total bytes 0 private allocs
DBE_WINDOW: 0 objects of 12 bytes = 0 total bytes 0 private allocs
TOTAL: 1 objects, 8 bytes, 0 allocs
[dix] Could not init font path element /usr/share/fonts/X11/cyrillic, removing from list!
Doctest: test-engine-extension.rst ... ok
test_mime_none (mimetypes-test.MimetypesTest) ... ok
test_mime_regex (mimetypes-test.MimetypesTest) ... ok
test_textplain (mimetypes-test.MimetypesTest) ... ok
test_scheme_file (mimetypes-test.SchemeTest) ... ok
test_scheme_none (mimetypes-test.SchemeTest) ... ok
testDeleteHook (engine-extension-test.TestExtensionHooks) ... ok
testGetHook (engine-extension-test.TestExtensionHooks) ... ok
testInsertHook (engine-extension-test.TestExtensionHooks) ... ok
testCreateEngine (engine-extension-test.TestExtensions) ... ok
for now we raise a ValueError if someone wants to search ... ok
testInTimeRange (datamodel-test.EventTest) ... ok
testNegationCombination (datamodel-test.EventTest) ... ok
testNegationFields (datamodel-test.EventTest) ... ok
testNegationTemplateMatching (datamodel-test.EventTest) ... ok
testNegationWildcardTemplateMatching (datamodel-test.EventTest) ... ok
testNewForValues1 (datamodel-test.EventTest) ... ok
testNewForValues2 (datamodel-test.EventTest) ... ok
testSimple (datamodel-test.EventTest) ... ok
testTemplateFiltering (datamodel-test.EventTest) ... ok
testTemplateMatching (datamodel-test.EventTest) ... ok
testTemplateParentMatching (datamodel-test.Ev...

[Markus Korn (thekorn)]

> It still fails with the blacklist-test.py! I had to quit zeitgeist manually
> for the tests to succeed. Here is my print out.
>
>
> seif@Wumbo:~/Projects/xxx/zeitgeist$ test/blacklist-test.py
> EEEE
[...]

Please note, the private/temporary DBus bus only works if you run the whole testsuite, by running `make check` or `test/run-all-tests.py`
I did not want to fire-up one temporary bus for each testcase, because I think this operation is too expensive (time consuming). And unfortunatly python2.5's unittest module does not have a way for module-wide setUp/tearDown methods.

[lp:~thekorn/zeitgeist/fix-634740-634744-testrunner-improvements]

1600. By Markus Korn on 2010-09-22

merged recent changes from lp:zeitgeist and resolved conflicts

1601. By Markus Korn on 2010-09-22

replaced spaces by tabs

1602. By Markus Korn on 2010-09-22

* print some information to stderr about the running private dbus bus
* add 'ignore_errors' option to DBusPrivateMessageBus.{run(),quit()}
  failures in these methods should never cause the actual tests to fail,
  as a fallback the old way (using the users session bus) will be used

1603. By Markus Korn on 2010-09-22

be more verbose in RuntimeError in case the zeitgeist-daemon fails to start in the testsuite

1604. By Markus Korn on 2010-09-22

* try to be more verbose in the testcases in case of zeitgeist-daemon
  failures

1605. By Markus Korn on 2010-09-22

added missing lazy import

1606. By Markus Korn on 2010-09-22

be even more verbose

1607. By Markus Korn on 2010-09-23

* test/run-all-tests.py: it is now possible to select which tests to run,
  that's a first step to clean up the testsuite

1608. By Markus Korn on 2010-09-23

small fix to make all tests runable

1609. By Markus Korn on 2010-09-23

also filter doctests based on pattern

1610. By Markus Korn on 2010-09-23

added a test script for seif's issue

1611. By Markus Korn on 2010-09-23

added some debug statement

[Siegfried Gevatter (rainct)]

Merged, good work.

review: Approve

=== added file 'bug_testrunner.py'
--- bug_testrunner.py	1970-01-01 00:00:00 +0000
+++ bug_testrunner.py	2010-09-23 11:07:07 +0000
@@ -0,0 +1,10 @@
+import os
+import glob
+from subprocess import Popen
+
+tests = map(lambda x: os.path.basename(x).rsplit(".", 1)[0], glob.glob("test/*.rst"))
+tests += map(lambda x: os.path.basename(x).rsplit(".", 1)[0], glob.glob("test/*-test.py"))
+
+for test in tests:
+    print "*****************", test
+    Popen(["test/run-all-tests.py", test, "blacklist-test"]).wait()

=== modified file 'test/blacklist-test.py'
--- test/blacklist-test.py	2010-04-26 19:42:07 +0000
+++ test/blacklist-test.py	2010-09-23 11:07:07 +0000
@@ -5,7 +5,6 @@
 import sys
 import os
 import unittest
-import dbus
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 from zeitgeist.client import ZeitgeistDBusInterface
@@ -19,6 +18,9 @@
 		self.blacklist = None
 	
 	def setUp(self):
+		# lazy import to get a chance to use the private bus
+		import dbus
+		
 		# We set up the connection lazily in order to wait for the
 		# engine to come up
 		super(BlacklistTest, self).setUp()

=== modified file 'test/engine-extension-test.py'
--- test/engine-extension-test.py	2010-08-02 10:13:12 +0000
+++ test/engine-extension-test.py	2010-09-23 11:07:07 +0000
@@ -7,30 +7,23 @@
 import weakref
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
-import _zeitgeist.engine
-from _zeitgeist.engine import constants
-from _zeitgeist.engine import get_engine
-from _zeitgeist.engine.extension import Extension
-
 import unittest
 from testutils import import_events
 
-class _Extension1(Extension):
-	PUBLIC_METHODS = ["return_hallo", "return_engine"]
-		
-	def return_hallo(self):
-		return "Hallo"
-		
-	def return_boo(self):
-		return "boo"
-		
-	def return_engine(self):
-		return self.engine
-
+Extension = None
 
 class _engineTestClass(unittest.TestCase):
 	
 	def setUp (self):
+		global Extension
+		
+		from _zeitgeist.engine import constants
+		from _zeitgeist.engine import get_engine
+		
+		if Extension is None:
+			from _zeitgeist.engine.extension import Extension as _Extension
+			Extension = _Extension
+		
 		constants.DATABASE_FILE = ":memory:"
 		self.save_default_ext = os.environ.get("ZEITGEIST_DEFAULT_EXTENSIONS")
 		self.save_extra_ext = os.environ.get("ZEITGEIST_EXTRA_EXTENSIONS")
@@ -39,6 +32,7 @@
 		self.engine = get_engine()
 		
 	def tearDown (self):
+		import _zeitgeist.engine
 		if self.save_default_ext is not None:
 			os.environ["ZEITGEIST_DEFAULT_EXTENSIONS"] = self.save_default_ext
 		else:
@@ -54,13 +48,27 @@
 class TestExtensions(_engineTestClass):
 	
 	def testCreateEngine(self):
-		engine = get_engine()
+
+		class _Extension1(Extension):
+			PUBLIC_METHODS = ["return_hallo", "return_engine"]
+				
+			def return_hallo(self):
+				return "Hallo"
+				
+			def return_boo(self):
+				return "boo"
+				
+			def return_engine(self):
+				return self.engine
+		
+		engine = self.engine
 		self.assertEqual(len(engine.extensions), 0)
 		self.assertRaises(AttributeError, engine.extensions.__getattr__, "return_hallo")
 		engine.extensions.load(_Extension1)
 		self.assertEqual(engine.extensions.return_hallo(), "Hallo")
 		self.assertRaises(AttributeError, engine.extensions.__getattr__, "return_boo")
 		self.assertEqual(engine.extensions.return_engine(), weakref.proxy(engine))
+		
 
 class TestExtensionHooks(_engineTestClass):
 	

=== modified file 'test/engine-test.py'
--- test/engine-test.py	2010-09-19 09:24:40 +0000
+++ test/engine-test.py	2010-09-23 11:07:07 +0000
@@ -6,10 +6,6 @@
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
-import _zeitgeist.engine
-from _zeitgeist.engine import constants
-from _zeitgeist.engine import get_engine
-from _zeitgeist.engine.sql import WhereClause
 from zeitgeist.datamodel import *
 from testutils import import_events
 
@@ -41,6 +37,9 @@
 class _engineTestClass(unittest.TestCase):
 	
 	def setUp (self):
+		from _zeitgeist.engine import constants
+		from _zeitgeist.engine import get_engine
+		
 		self.save_default_ext = os.environ.get("ZEITGEIST_DEFAULT_EXTENSIONS")
 		self.save_extra_ext = os.environ.get("ZEITGEIST_EXTRA_EXTENSIONS")
 		os.environ["ZEITGEIST_DEFAULT_EXTENSIONS"] = ""
@@ -58,6 +57,7 @@
 		self.engine = get_engine()
 	
 	def tearDown (self):
+		import _zeitgeist.engine
 		if self.save_default_ext is not None:
 			os.environ["ZEITGEIST_DEFAULT_EXTENSIONS"] = self.save_default_ext
 		else:
@@ -935,6 +935,8 @@
 		self.assertEquals(5, len(ids))
 		
 	def testWildcardOptimization(self):
+		from _zeitgeist.engine.sql import WhereClause
+		
 		cursor = self.engine._cursor
 		strings = [
 			(u"hällö, I'm gürmen - åge drikker øl - ☠ bug",),

=== modified file 'test/loggers-datasources-recent-test.py'
--- test/loggers-datasources-recent-test.py	2009-11-30 07:57:58 +0000
+++ test/loggers-datasources-recent-test.py	2010-09-23 11:07:07 +0000
@@ -7,16 +7,28 @@
 import unittest
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from _zeitgeist.loggers.datasources.recent import SimpleMatch, MimeTypeSet
-
-class SimpleMatchTest(unittest.TestCase):
+
+SimpleMatch = None
+MimeTypeSet = None
+
+class BaseTestCase(unittest.TestCase):
+	
+	def setUp(self):
+		global SimpleMatch
+		global MimeTypeSet
+		if None in (SimpleMatch, MimeTypeSet):
+			from _zeitgeist.loggers.datasources.recent import SimpleMatch as _SM, MimeTypeSet as _MTS
+			SimpleMatch = _SM
+			MimeTypeSet = _MTS
+
+class SimpleMatchTest(BaseTestCase):
 	
 	def testmatch(self):
 		self.assertTrue(SimpleMatch("boo/*").match("boo/bar"))
 		self.assertTrue(SimpleMatch("boo/bar.*").match("boo/bar.foo"))
 		self.assertFalse(SimpleMatch("boo/bar.*").match("boo/barfoo"))
 
-class MimeTypeSetTest(unittest.TestCase):
+class MimeTypeSetTest(BaseTestCase):
 	
 	def testinit(self):
 		self.assertEquals(repr(MimeTypeSet("boo", "bar", "foo")), "MimeTypeSet('bar', 'boo', 'foo')")

=== modified file 'test/remote-test.py'
--- test/remote-test.py	2010-09-15 14:20:21 +0000
+++ test/remote-test.py	2010-09-23 11:07:07 +0000
@@ -6,6 +6,8 @@
 import logging
 import signal
 import time
+import tempfile
+import shutil
 from subprocess import Popen, PIPE
 
 # DBus setup
@@ -18,7 +20,6 @@
 from zeitgeist.client import ZeitgeistDBusInterface, ZeitgeistClient
 from zeitgeist.datamodel import (Event, Subject, Interpretation, Manifestation,
 	TimeRange, StorageState)
-from _zeitgeist.engine.remote import RemoteInterface
 
 import testutils
 from testutils import parse_events
@@ -322,9 +323,31 @@
 		
 class ZeitgeistRemoteInterfaceTest(unittest.TestCase):
 	
+	def setUp(self):
+		from _zeitgeist import engine
+		from _zeitgeist.engine import sql, constants
+		engine._engine = None
+		sql.unset_cursor()
+		self.saved_data = {
+			"datapath": constants.DATA_PATH,
+			"database": constants.DATABASE_FILE,
+			"extensions": constants.USER_EXTENSION_PATH,
+		}
+		constants.DATA_PATH = tempfile.mkdtemp(prefix="zeitgeist.datapath.")
+		constants.DATABASE_FILE = ":memory:"
+		constants.USER_EXTENSION_PATH = os.path.join(constants.DATA_PATH, "extensions")
+		
+	def tearDown(self):
+		from _zeitgeist.engine import constants
+		shutil.rmtree(constants.DATA_PATH)
+		constants.DATA_PATH = self.saved_data["datapath"]
+		constants.DATABASE_FILE = self.saved_data["database"]
+		constants.USER_EXTENSION_PATH = self.saved_data["extensions"]
+	
 	def testQuit(self):
 		"""calling Quit() on the remote interface should shutdown the
 		engine in a clean way"""
+		from _zeitgeist.engine.remote import RemoteInterface
 		interface = RemoteInterface()
 		self.assertEquals(interface._engine.is_closed(), False)
 		interface.Quit()
@@ -332,17 +355,21 @@
 		
 class ZeitgeistDaemonTest(unittest.TestCase):
 	
+	def setUp(self):
+		self.env = os.environ.copy()
+		self.datapath = tempfile.mkdtemp(prefix="zeitgeist.datapath.")
+		self.env.update({
+			"ZEITGEIST_DATABASE_PATH": ":memory:",
+			"ZEITGEIST_DATA_PATH": self.datapath,
+		})
+		
+	def tearDown(self):
+		shutil.rmtree(self.datapath)
+	
 	def testSIGHUP(self):
 		"""sending a SIGHUP signal to a running deamon instance results
 		in a clean shutdown"""
-		daemon = Popen(
-			["./zeitgeist-daemon.py", "--no-datahub"], stderr=PIPE, stdout=PIPE
-		)
-		# give the daemon some time to wake up
-		time.sleep(3)
-		err = daemon.poll()
-		if err:
-			raise RuntimeError("Could not start daemon,  got err=%i" % err)
+		daemon = testutils.RemoteTestCase._safe_start_daemon(env=self.env)
 		os.kill(daemon.pid, signal.SIGHUP)
 		err = daemon.wait()
 		self.assertEqual(err, 0)

=== modified file 'test/run-all-tests.py'
--- test/run-all-tests.py	2010-09-02 14:33:04 +0000
+++ test/run-all-tests.py	2010-09-23 11:07:07 +0000
@@ -6,36 +6,107 @@
 import doctest
 import logging
 import sys
+import tempfile
+import shutil
 
 from optparse import OptionParser
-parser = OptionParser()
-parser.add_option("-v", action="count", dest="verbosity")
-(options, args) = parser.parse_args()
-
-if options.verbosity:
-	# do more fine grained stuff later
-	# redirect all debugging output to stderr
-	logging.basicConfig(stream=sys.stderr)
-else:
-	logging.basicConfig(filename="/dev/null")
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 # Find the test/ directory
-testdir = os.path.dirname(os.path.abspath(__file__))
-doctests = glob.glob(os.path.join(testdir, "*.rst"))
-
-# Create a test suite to run all tests
-# first, add all doctests
-arguments = {"module_relative": False, "globs": {"sys": sys}}
-suite = doctest.DocFileSuite(*doctests, **arguments)
-
-# Add all of the tests from each file that ends with "-test.py"
-for fname in os.listdir(testdir):
-	if fname.endswith("-test.py"):
-		fname = os.path.basename(fname)[:-3] # Get the filename and chop off ".py"
-		module = __import__(fname)
-		suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(module))
-
-# Run all of the tests
-unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
+TESTDIR = os.path.dirname(os.path.abspath(__file__))
+DOCTESTS = glob.glob(os.path.join(TESTDIR, "*.rst"))
+
+def doctest_setup(test):
+	test._datapath = tempfile.mkdtemp(prefix="zeitgeist.datapath.")
+	test._env = os.environ.copy()
+	os.environ.update({
+		"ZEITGEIST_DATABASE_PATH": ":memory:",
+		"ZEITGEIST_DATA_PATH": test._datapath
+	})
+	
+def doctest_teardown(test):
+	shutil.rmtree(test._datapath)
+	os.environ = test._env
+	
+def iter_tests(suite):
+	for test in suite:
+		if isinstance(test, unittest.TestSuite):
+			for t in iter_tests(test):
+				yield t
+		else:
+			yield test
+			
+def get_test_name(test):
+	return ".".join((test.__class__.__module__, test.__class__.__name__, test._testMethodName))
+	
+def load_tests(module, pattern):
+	suite = unittest.defaultTestLoader.loadTestsFromModule(module)
+	for test in iter_tests(suite):
+		name = get_test_name(test)
+		if pattern is not None:
+			for p in pattern:
+				if name.startswith(p):
+					yield test
+					break
+		else:
+			yield test
+			
+def check_name(filename, pattern):
+	if pattern is None:
+		return True
+	for p in pattern:
+		if os.path.basename(filename).startswith(p):
+			return True
+	return False
+
+def compile_suite(pattern=None):
+	# Create a test suite to run all tests
+	
+	# first, add all doctests
+	arguments = {
+		"module_relative": False,
+		"globs": {"sys": sys},
+		"setUp": doctest_setup,
+		"tearDown": doctest_teardown,
+	}
+	doctests = filter(lambda x: check_name(str(x), pattern), DOCTESTS)
+	suite = doctest.DocFileSuite(*doctests, **arguments)
+
+	# Add all of the tests from each file that ends with "-test.py"
+	for fname in os.listdir(TESTDIR):
+		if fname.endswith("-test.py"):
+			fname = os.path.basename(fname)[:-3] # Get the filename and chop off ".py"
+			module = __import__(fname)
+			tests = list(load_tests(module, pattern))
+			suite.addTests(tests)
+	return suite
+
+if __name__ == "__main__":
+	parser = OptionParser()
+	parser.add_option("-v", action="count", dest="verbosity")
+	(options, args) = parser.parse_args()
+
+	if options.verbosity:
+		# do more fine grained stuff later
+		# redirect all debugging output to stderr
+		logging.basicConfig(stream=sys.stderr)
+	else:
+		logging.basicConfig(filename="/dev/null")
+	
+	from testutils import DBusPrivateMessageBus
+	bus = DBusPrivateMessageBus()
+	err = bus.run(ignore_errors=True)
+	if err:
+		print >> sys.stderr, "*** Failed to setup private bus, error was: %s" %err
+	else:
+		print >> sys.stderr, "*** Testsuite is running using a private dbus bus"
+		config = bus.dbus_config.copy()
+		config.update({"DISPLAY": bus.DISPLAY, "pid.Xvfb": bus.display.pid})
+		print >> sys.stderr, "*** Configuration: %s" %config
+	try:
+		suite = compile_suite(args or None)
+		# Run all of the tests
+		unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
+	finally:
+		bus.quit(ignore_errors=True)

=== modified file 'test/sql-test.py'
--- test/sql-test.py	2010-09-19 11:49:41 +0000
+++ test/sql-test.py	2010-09-23 11:07:07 +0000
@@ -23,10 +23,16 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import unittest
-from _zeitgeist.engine.sql import *
+WhereClause = None
 
 class SQLTest (unittest.TestCase):
 	
+	def setUp(self):
+		global WhereClause
+		if WhereClause is None:
+			from _zeitgeist.engine.sql import WhereClause as _WhereClause
+			WhereClause = _WhereClause
+	
 	def testFlat (self):
 		where = WhereClause(WhereClause.AND)
 		where.add ("foo = %s", 10)

=== modified file 'test/testutils.py'
--- test/testutils.py	2010-07-22 09:52:53 +0000
+++ test/testutils.py	2010-09-23 11:07:07 +0000
@@ -3,6 +3,7 @@
 # Zeitgeist
 #
 # Copyright © 2009 Mikkel Kamstrup Erlandsen <[e-mail]>
+# Copyright © 2009-2010 Markus Korn <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +23,8 @@
 import time
 import sys
 import signal
+import tempfile
+import shutil
 from subprocess import Popen, PIPE
 
 # DBus setup
@@ -41,8 +44,6 @@
 	# maybe the user is using python < 2.6
 	import simplejson as json
 
-from zeitgeist.datamodel import Event, Subject
-
 def dict2event(d):
 	ev = Event()
 	ev[0][Event.Id] = d.get("id", "").encode("UTF-8")
@@ -74,7 +75,7 @@
 	"""
 	Load a collection of JSON event definitions into 'engine'. Fx:
 	
-	    import_events("test/data/single_event.js", self.engine)
+		import_events("test/data/single_event.js", self.engine)
 	"""
 	events = parse_events(path)
 	
@@ -86,21 +87,50 @@
 	remote Zeitgeist process
 	"""
 	
+	@staticmethod
+	def _get_pid(matching_string):
+		p1 = Popen(["ps", "aux"], stdout=PIPE, stderr=PIPE)
+		p2 = Popen(["grep", matching_string], stdin=p1.stdout, stderr=PIPE, stdout=PIPE)
+		return p2.communicate()[0]
+		
+	@staticmethod
+	def _safe_start_subprocess(cmd, env, timeout=1, error_callback=None):
+		""" starts `cmd` in a subprocess and check after `timeout`
+		if everything goes well"""
+		process = Popen(cmd, stderr=PIPE, stdout=PIPE, env=env)
+		# give the process some time to wake up
+		time.sleep(timeout)
+		error = process.poll()
+		if error:
+			cmd = " ".join(cmd)
+			error = "'%s' exits with error %i." %(cmd, error)
+			if error_callback:
+				error += " *** %s" %error_callback(*process.communicate())
+			raise RuntimeError(error)
+		return process
+		
+	@staticmethod
+	def _safe_start_daemon(env=None, timeout=1):
+		if env is None:
+			env = os.environ.copy()
+			
+		def error_callback(stdout, stderr):
+			if "--replace" in stderr:
+				return "%r | %s" %(stderr, RemoteTestCase._get_pid("zeitgeist-daemon").replace("\n", "|"))
+			else:
+				return stderr
+			
+		return RemoteTestCase._safe_start_subprocess(
+			("./zeitgeist-daemon.py", "--no-datahub"), env, timeout, error_callback
+		)
+	
 	def __init__(self, methodName):
 		super(RemoteTestCase, self).__init__(methodName)
 		self.daemon = None
 		self.client = None
 	
 	def spawn_daemon(self):
-		os.environ.update({"ZEITGEIST_DATABASE_PATH": ":memory:"})
-		self.daemon = Popen(
-			["./zeitgeist-daemon.py", "--no-datahub"], stderr=sys.stderr, stdout=sys.stderr
-		)
-		# give the daemon some time to wake up
-		time.sleep(3)
-		err = self.daemon.poll()
-		if err:
-			raise RuntimeError("Could not start daemon,  got err=%i" % err)
+		self.daemon = self._safe_start_daemon(env=self.env)
 	
 	def kill_daemon(self):
 		os.kill(self.daemon.pid, signal.SIGKILL)
@@ -109,6 +139,12 @@
 	def setUp(self):
 		assert self.daemon is None
 		assert self.client is None
+		self.env = os.environ.copy()
+		self.datapath = tempfile.mkdtemp(prefix="zeitgeist.datapath.")
+		self.env.update({
+			"ZEITGEIST_DATABASE_PATH": ":memory:",
+			"ZEITGEIST_DATA_PATH": self.datapath,
+		})
 		self.spawn_daemon()
 		
 		# hack to clear the state of the interface
@@ -119,6 +155,7 @@
 		assert self.daemon is not None
 		assert self.client is not None
 		self.kill_daemon()
+		shutil.rmtree(self.datapath)
 	
 	def insertEventsAndWait(self, events):
 		"""
@@ -220,3 +257,45 @@
 			num_events=num_events, result_type=result_type)
 		mainloop.run()
 		return result
+
+class DBusPrivateMessageBus(object):
+	DISPLAY = ":27"
+
+	def _run(self):
+		os.environ.update({"DISPLAY": self.DISPLAY})
+		self.display = Popen(["Xvfb", self.DISPLAY, "-screen", "0", "1024x768x8"])
+		# give the display some time to wake up
+		time.sleep(1)
+		err = self.display.poll()
+		if err:
+			raise RuntimeError("Could not start Xvfb on display %s, got err=%i" %(self.DISPLAY, err))
+		dbus = Popen(["dbus-launch"], stdout=PIPE)
+		time.sleep(1)
+		self.dbus_config = dict(l.split("=", 1) for l in dbus.communicate()[0].split("\n") if l)
+		os.environ.update(self.dbus_config)
+		
+	def run(self, ignore_errors=False):
+		try:
+			return self._run()
+		except Exception, e:
+			if ignore_errors:
+				return e
+			raise
+
+	def _quit(self):
+		os.kill(self.display.pid, signal.SIGKILL)
+		self.display.wait()
+		pid = int(self.dbus_config["DBUS_SESSION_BUS_PID"])
+		os.kill(pid, signal.SIGKILL)
+		try:
+			os.waitpid(pid, 0)
+		except OSError:
+			pass
+			
+	def quit(self, ignore_errors=False):
+		try:
+			return self._quit()
+		except Exception, e:
+			if ignore_errors:
+				return e
+			raise