*/*: reorganize for easy testing using setuptools or tox.

Now running either,

  $ python setup.py test

or

  $ tox

will execute the test suite. (The former is deprecated, but is easier
for now, and most importantly doesn't require tox.)

diff --git a/MANIFEST.in b/MANIFEST.in
index 6ce0ed812b69a43dcc2324a9609632a4faefb373..ed41b1b8032424f7f7b5aab3888b5bc34c179fba 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
 recursive-include doc *
+recursive-include test *

diff --git a/src/djbdns/common.py b/djbdns/common.py
similarity index 100%
rename from src/djbdns/common.py
rename to djbdns/common.py

diff --git a/src/djbdns/dnscache.py b/djbdns/dnscache.py
similarity index 100%
rename from src/djbdns/dnscache.py
rename to djbdns/dnscache.py

diff --git a/src/djbdns/io.py b/djbdns/io.py
similarity index 95%
rename from src/djbdns/io.py
rename to djbdns/io.py
index eee86cb3d4b99e888065e6384a4cf5438a3a2b30..7c70bab3debcf2b78ad43e18146488740cdf1c4e 100644 (file)
--- a/src/djbdns/io.py
+++ b/djbdns/io.py
@@ -44,3 +44,6 @@ def parse_logfile(file : TextIO):
                 friendly_line = line
 
         print(friendly_line)
+
+    # Ensure that the pipe gets closed.
+    tai.communicate()

diff --git a/src/djbdns/tinydns.py b/djbdns/tinydns.py
similarity index 100%
rename from src/djbdns/tinydns.py
rename to djbdns/tinydns.py

diff --git a/setup.py b/setup.py
index c569f13f62e2673ecf2d189adfa9bad2f9150534..f3f664d50d324d03aeb91b813d9948249199d2fa 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name         = 'djbdns-logparse',
@@ -9,7 +9,8 @@ setup(
     keywords     = 'djbdns, tinydns, dnscache',
     scripts      = ['bin/djbdns-logparse'],
     packages     = ['djbdns'],
-    package_dir  = {'djbdns': 'src/djbdns'},
+    package_dir  = {'djbdns': 'djbdns'},
     description  = 'Convert tinydns and dnscache logs to human-readable form',
-    license      = 'doc/LICENSE'
+    test_suite   = 'test.build_suite',
+    license      = 'AGPLv3+'
 )

diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644 (file)
index 0000000..8c5ac13
--- /dev/null
+++ b/test/__init__.py
@@ -0,0 +1,15 @@
+def build_suite():
+    from doctest import DocTestSuite
+    from unittest import TestSuite
+    import djbdns.common
+    import djbdns.dnscache
+    import djbdns.io
+    import djbdns.tinydns
+
+    tests = TestSuite()
+    tests.addTests(DocTestSuite(djbdns.common))
+    tests.addTests(DocTestSuite(djbdns.dnscache))
+    tests.addTests(DocTestSuite(djbdns.io))
+    tests.addTests(DocTestSuite(djbdns.tinydns))
+
+    return tests

diff --git a/tox.ini b/tox.ini
new file mode 100644 (file)
index 0000000..7ae3c95
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[testenv]
+commands =
+    python -m doctest -v djbdns/common.py
+    python -m doctest -v djbdns/dnscache.py
+    python -m doctest -v djbdns/io.py
+    python -m doctest -v djbdns/tinydns.py