Index: tests/test-leak.py.in
===================================================================
--- tests/test-leak.py.in	(revision 5268)
+++ tests/test-leak.py.in	(working copy)
@@ -24,8 +24,6 @@
 sys.path.insert(0, "@srcdir@/..")
 sys.path.insert(0, "..")

-from twisted.trial import unittest, runner, reporter
-
 from twisted.internet import selectreactor, main
 class MyReactor(selectreactor.SelectReactor):
       def runUntilCurrent(self):
@@ -41,21 +39,17 @@

 from twisted.web import client, http

-from tests import testmessages
-verbose = int(os.environ.get('VERBOSE_T', '-1'))
-if verbose < 0: testmessages.silence_all_messages()
-
 from tests import testclock

 from pokernetwork import pokermemcache
 from pokernetwork import pokersite
 from pokernetwork import pokernetworkconfig
 from pokernetwork import pokerservice
-from pokernetwork import proxyfilter
 from pokernetwork.pokerpackets import *

+verbose = int(os.environ.get('VERBOSE_T', '-1'))
 settings_xml_server = """<?xml version="1.0" encoding="ISO-8859-1"?>
-<server verbose="6" ping="300000" autodeal="yes" simultaneous="4" chat="yes" >
+<server verbose="%i" ping="300000" autodeal="yes" simultaneous="4" chat="yes" >
   <delays autodeal="20" round="0" position="0" showdown="0" autodeal_max="1" finish="0" messages="60" />

   <table name="Table1" variant="holdem" betting_structure="100-200-no-limit" seats="10" player_timeout="60" currency_serial="1" />
@@ -66,13 +60,13 @@

   <cashier acquire_timeout="5" pokerlock_queue_timeout="30" user_create="yes" />
   <database name="pokernetworktest" host="localhost" user="pokernetworktest" password="pokernetwork"
-            root_user="@MYSQL_TEST_DBROOT@" root_password="@MYSQL_TEST_DBROOT_PASSWORD@" schema="@srcdir@/../../database/schema.sql" command="@MYSQL@" />
+            root_user="@MYSQL_TEST_DBROOT@" root_password="@MYSQL_TEST_DBROOT_PASSWORD@" schema="@srcdir@/../database/schema.sql" command="@MYSQL@" />
   <path>.. ../@srcdir@ @POKER_ENGINE_PKGSYSCONFDIR@ @POKER_NETWORK_PKGSYSCONFDIR@</path>
   <users temporary="BOT"/>
 </server>
-"""
+""" % verbose

-class LeakTestCase(unittest.TestCase):
+class LeakTestCase:

       def destroyDb(self, arg = None):
             if len("@MYSQL_TEST_DBROOT_PASSWORD@") > 0:
@@ -129,7 +123,6 @@
             f(None)
             d = defer.Deferred()
             return d
-      test01_getPage.timeout = pow(2, 30)

       def test02_ping(self):
             """
@@ -151,7 +144,6 @@
             f(None)
             d = defer.Deferred()
             return d
-      test02_ping.timeout = pow(2, 30)

       def test03_joinTable(self):
             """
@@ -181,7 +173,6 @@
             f(None, i)
             d = defer.Deferred()
             return d
-      test03_joinTable.timeout = pow(2, 30)

       def test04_joinTable_guppy(self):
             import guppy, gc
@@ -209,26 +200,14 @@
             f(None, first, first, i)
             d = defer.Deferred()
             return d
-      test04_joinTable_guppy.timeout = pow(2, 30)

-def Run():
-      loader = runner.TestLoader()
-      loader.methodPrefix = "test04"
-      suite = loader.suiteFactory()
-      suite.addTest(loader.loadClass(LeakTestCase))
-      return runner.TrialRunner(
-            reporter.VerboseTextReporter,
-            tracebackFormat='default',
-#            logfile = '-',
-            ).run(suite)
-
 if __name__ == '__main__':
-      if Run().wasSuccessful():
-            sys.exit(0)
-      else:
-            sys.exit(1)
+      t = LeakTestCase()
+      t.setUp()
+      t.test04_joinTable_guppy()
+      reactor.run()

 # Interpreted by emacs
 # Local Variables:
-# compile-command: "( cd .. ; ./config.status tests/test-leak.py ) ; ( cd ../tests ; make VERBOSE_T=-1 TESTS='test-leak.py' check )"
+# compile-command: "( cd .. ; ./config.status tests/test-leak.py ) ; ( cd ../tests ; VERBOSE_T=-1 python test-leak.py )"
 # End: