X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2F__init__.py;h=074b2b13b3a24fe1c94447ce317e9781ac35d517;hb=5bcb67b592ff12a57f7cb9803305c380342ef71c;hp=6942bf2f2af83c8749bae65c586f685ec5b95e08;hpb=bdb596b84a06d0c97e39d42586a51fc36ba44186;p=dunshire.git

diff --git a/test/__init__.py b/test/__init__.py
index 6942bf2..074b2b1 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -8,12 +8,14 @@ can be used by setuptools.
 """
 
 from unittest import TestLoader, TestSuite, TextTestRunner
-from doctest import DocTestSuite
+from doctest import DocTestSuite, ELLIPSIS
 
 from dunshire import cones
 from dunshire import errors
 from dunshire import matrices
 from dunshire import games
+from test import matrices_test
+from test import randomgen
 from test import symmetric_linear_game_test
 
 def build_suite():
@@ -22,18 +24,21 @@ def build_suite():
     """
     suite = TestSuite()
     suite.addTest(DocTestSuite(cones))
-    suite.addTest(DocTestSuite(errors))
-    suite.addTest(DocTestSuite(matrices))
-    suite.addTest(DocTestSuite(games))
+    suite.addTest(DocTestSuite(errors, optionflags=ELLIPSIS))
+    suite.addTest(DocTestSuite(games, optionflags=ELLIPSIS))
+    suite.addTest(DocTestSuite(matrices, optionflags=ELLIPSIS))
     suite.addTest(DocTestSuite(symmetric_linear_game_test))
+    suite.addTest(DocTestSuite(randomgen))
     slg_tests = TestLoader().loadTestsFromModule(symmetric_linear_game_test)
     suite.addTest(slg_tests)
+    mat_tests = TestLoader().loadTestsFromModule(matrices_test)
+    suite.addTest(mat_tests)
     return suite
 
-def run_suite(s):
+def run_suite(suite):
     """
     Run all of the unit and doctests for the ``dunshire`` and ``test``
     packages.
     """
     runner = TextTestRunner(verbosity=1)
-    runner.run(s)
+    return runner.run(suite)