X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fsuite.py;h=bfd0011ff3b1a40d9e1e82b238766e65e179a8d9;hb=b8874a4b98279d8f5902e4f97dce55c67012371e;hp=e66d3add917acf2dfee4b02a96f67c39fc73a3cc;hpb=7c5ede653e5873b53c7c4b06c081f314c9ef640b;p=dunshire.git

diff --git a/test/suite.py b/test/suite.py
index e66d3ad..bfd0011 100644
--- 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('.')
+addsitedir('./src/dunshire')
 import cones
+import errors
 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))
-
-runner = unittest.TextTestRunner(verbosity=2)
+suite = TestSuite()
+suite.addTest(DocTestSuite(cones))
+suite.addTest(DocTestSuite(errors))
+suite.addTest(DocTestSuite(matrices))
+suite.addTest(DocTestSuite(symmetric_linear_game))
+suite.addTest(TestLoader().loadTestsFromModule(symmetric_linear_game))
+runner = TextTestRunner(verbosity=2)
 runner.run(suite)