X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fsuite.py;h=714bd5711a149775f80c6e35ddc270da626dd0c5;hb=556f614c2cbbe91e34967ea78464436413ae1c75;hp=836e0ba0913543364b3d717a23373dfa18764991;hpb=56ea961887d507114174af5f92b8c3c77b0b7a50;p=dunshire.git

diff --git a/test/suite.py b/test/suite.py
index 836e0ba..714bd57 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('./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))
+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)