Merge lp:~stefanor/ibid/setup-test into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Add test hook to setup.py

[Max Rabkin (max-rabkin)]

This conflicts with testing-framework.

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

[Ibid Branch Auto-Lander (ibid-tarmac)]

Attempt to merge into lp:ibid failed due to conflicts:

text conflict in ibid/test/__init__.py

[Ibid Branch Auto-Lander (ibid-tarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Max Rabkin (max-rabkin)]

review: Approve

=== modified file 'ibid/test/__init__.py'
--- ibid/test/__init__.py	2011-02-01 15:55:56 +0000
+++ ibid/test/__init__.py	2011-03-15 10:02:27 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 2009-2011, Jeremy Thurgood, Max Rabkin
+# Copyright (c) 2009-2011, Jeremy Thurgood, Max Rabkin, Stefano Rivera
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
-import atexit
+
 import logging
 import os
 from traceback import format_exception
@@ -20,6 +20,7 @@
 from ibid.config import FileConfig
 from ibid.utils import locate_resource
 
+
 # Trial collects log output, so we feed ours logs into it.
 class TwistedLogHandler(logging.Handler):
     def emit(self, record):
@@ -42,14 +43,15 @@
     def __setattr__(self, name, value):
         self[name] = value
 
-
 def set_config(config):
     ibid.config = FakeConfig(config)
 
+
 class TestAuth(object):
     def authorise(self, event, permission):
         return True
 
+
 class TestSource(object):
     type = 'test'
     permissions = []
@@ -67,6 +69,7 @@
     def url(self):
         return None
 
+
 class PluginTestCase(unittest.TestCase):
     load = []
     noload = []
@@ -212,4 +215,12 @@
         ibid.databases.ibid().bind.engine.dispose()
         os.unlink(self.dbfile)
 
+
+def run():
+    "Run the Ibid test suite. Bit of a hack"
+    from twisted.scripts.trial import run
+    import sys
+    sys.argv.append('ibid')
+    run()
+
 # vi: set et sta sw=4 ts=4:

=== modified file 'setup.py'
--- setup.py	2011-03-13 15:12:28 +0000
+++ setup.py	2011-03-15 10:02:27 +0000
@@ -65,6 +65,7 @@
         'scripts/ibid-setup',
         'scripts/ibid.tac',
     ],
+    test_suite='ibid.test.run',
 
     include_package_data=True,
     zip_safe=False,