Use Automake's simple test infrastructure for running Python-based

tests.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ff6253d30ca2438c5c88df48a8e99dd007bbbc15..6795672a9a23909e8656319306b5b232a15ff68f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,11 +26,11 @@ disorder_udplog_SOURCES=udplog.c
 disorder_udplog_LDADD=$(LIBOBJS) ../lib/libdisorder.a
 disorder_udplog_DEPENDENCIES=../lib/libdisorder.a
 
-check:
-       ${PYTHON} -u ${srcdir}/alltests
+TESTS=cookie.py dbversion.py dump.py files.py play.py queue.py \
+       recode.py search.py user-upgrade.py user.py
 
 clean-local:
        rm -rf testroot *.log *.pyc
 
-EXTRA_DIST=alltests dtest.py dbversion.py search.py \
+EXTRA_DIST=dtest.py dbversion.py search.py \
        queue.py dump.py play.py cookie.py user-upgrade.py user.py recode.py

diff --git a/tests/alltests b/tests/alltests
deleted file mode 100755 (executable)
index 812b53a..0000000
--- a/tests/alltests
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env python
-#
-# This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-import sys,re,os.path,os
-
-# Parse the makefile in the current directory to identify the source directory
-top_srcdir = None
-for l in file("Makefile"):
-    r = re.search("^top_srcdir *= *(.*)$",  l)
-    if r:
-        top_srcdir = r.group(1)
-        break
-if not top_srcdir:
-    fatal("cannot identify source directory")
-
-# Make sure that the test directory is on the module search path (so we can
-# find dtest and the tests themselves)
-testdir = os.path.join(top_srcdir, "tests")
-sys.path.insert(0, testdir)
-import dtest
-
-# The tests are all the *.py files in the test source directory that
-# call dtest.run
-tests = []
-for f in os.listdir(testdir):
-    if f == 'dtest.py':                 # special case
-        continue
-    r = re.search("^(.*)\\.py$", f)
-    if r is not None:
-        isTest = False
-        base = r.group(1)
-        for l in file(os.path.join(testdir, f)):
-            r = re.search("dtest\\.run", l)
-            if r is not None:
-                isTest = True
-                break
-        if isTest:
-            tests.append(base)
-tests.sort()                            # let's have a consistent order
-
-for test in tests:
-    print "-------- Test '%s' --------" % test
-    dtest.run(test, report=False)
-
-print "%d tests" % dtest.tests
-if dtest.failures:
-    print "%d failures" % dtest.failures
-    sys.exit(1)
-else:
-    print "All tests OK"

diff --git a/tests/cookie.py b/tests/cookie.py
index 8a9182977286011d0d67fc1ee03295f607f889d1..21353b08a8eeb24dff9d53f8805147c6c7c8ed3b 100755 (executable)
--- a/tests/cookie.py
+++ b/tests/cookie.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007 Richard Kettlewell

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 218e0c9023056442f3cad13539c2859e5fb185c9..c93e1e8e4d33f1f470086f41c6c516e0ca6a3679 100755 (executable)
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell

diff --git a/tests/dump.py b/tests/dump.py
index ff28a0ffc32001c3187f723dbd546f22e4a1dd41..c935f204d46bf4d8d52d25f92b9d141212d00343 100755 (executable)
--- a/tests/dump.py
+++ b/tests/dump.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell

diff --git a/tests/files.py b/tests/files.py
index 984c6cca89dd839d05e26f10112aada72b96a592..65211dc16d6ee24e5389c4a6fea6c9cae7dfa883 100755 (executable)
--- a/tests/files.py
+++ b/tests/files.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell

diff --git a/tests/play.py b/tests/play.py
index 0013d7e3e62b420d4c0b496ffa3d598e1a2c0000..35cc7a3fa384881d57db1d21c48796bdb1a5d7f5 100755 (executable)
--- a/tests/play.py
+++ b/tests/play.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell

diff --git a/tests/queue.py b/tests/queue.py
index dae37b47d473206d825940eb4e7c55796a6e5dbe..a1ddedfe8217f8656ff6a88b4d90e2eb45a671d6 100755 (executable)
--- a/tests/queue.py
+++ b/tests/queue.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell

diff --git a/tests/recode.py b/tests/recode.py
index 1539da0ea871d7ee84750ddbc380782d4c06c04b..d57db022445ac10811b3ab3ef1136186ecd676b9 100755 (executable)
--- a/tests/recode.py
+++ b/tests/recode.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
 # Copyright (C) 2008 Richard Kettlewell
@@ -42,7 +42,7 @@ def test():
     if sys.platform == "darwin":
       print "Sorry, cannot run this test on Darwin"
       # ...because local fs is always UTF-8
-      return
+      sys.exit(77)
     dtest.start_daemon()
     dtest.create_user()
     dtest.rescan()

diff --git a/tests/search.py b/tests/search.py
index 1b86bea25b89402866b7babf76130794ef3f2329..556a24c4ad798809f1fdbd7835e638caf8c30dae 100755 (executable)
--- a/tests/search.py
+++ b/tests/search.py
@@ -1,7 +1,7 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/tests/user-upgrade.py b/tests/user-upgrade.py
index 3bab5816aab1dd79c70a76e2788110819157c54c..ffd30ea2d15ad46810302c86d5662701ea80c86a 100755 (executable)
--- a/tests/user-upgrade.py
+++ b/tests/user-upgrade.py
@@ -1,7 +1,7 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/tests/user.py b/tests/user.py
index 1f3a39fe568775f767ed7b2ee74d512fd7cc6c4c..4c4fa4884cd1051938e6d1f361972b857eb639f4 100755 (executable)
--- a/tests/user.py
+++ b/tests/user.py
@@ -1,7 +1,7 @@
-#! /usr/bin/env python
+#! /usr/bin/env python -u
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by