Clean up a bit of the import mess.

[dunshire.git] / test / suite.py

diff --git a/test/suite.py b/test/suite.py
index e66d3add917acf2dfee4b02a96f67c39fc73a3cc..7051b9c3ceb3ab28b9dc1d90939d99537123f406 100644 (file)
--- a/test/suite.py
+++ b/test/suite.py
@@ -1,17 +1,26 @@
-import unittest
-import doctest
+"""
+The whole test suite.
+
+This module compiles the doctests and unittests from the rest of the
+codebase into one big TestSuite() and the runs it.
+"""
+
+from unittest import TestLoader, TestSuite, TextTestRunner
+from doctest import DocTestSuite
 
 # Add '../' to our path.
 from site import addsitedir
-addsitedir('.')
-import cones
-import matrices
-import symmetric_linear_game
-
-suite = unittest.TestSuite()
-suite.addTest(doctest.DocTestSuite(cones))
-suite.addTest(doctest.DocTestSuite(matrices))
-suite.addTest(doctest.DocTestSuite(symmetric_linear_game))
+addsitedir('./src')
+from dunshire import cones
+from dunshire import errors
+from dunshire import matrices
+from dunshire import games
 
-runner = unittest.TextTestRunner(verbosity=2)
+suite = TestSuite()
+suite.addTest(DocTestSuite(cones))
+suite.addTest(DocTestSuite(errors))
+suite.addTest(DocTestSuite(matrices))
+suite.addTest(DocTestSuite(games))
+suite.addTest(TestLoader().loadTestsFromModule(games))
+runner = TextTestRunner(verbosity=2)
 runner.run(suite)