Fix typo in last commit.

[dunshire.git] / test / __init__.py

diff --git a/test/__init__.py b/test/__init__.py
index 4241453f5a99fddb29d3e682244bca48a8f48799..074b2b13b3a24fe1c94447ce317e9781ac35d517 100644 (file)
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -8,12 +8,14 @@ can be used by setuptools.
 """
 
 from unittest import TestLoader, TestSuite, TextTestRunner
 """
 
 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 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():
 from test import symmetric_linear_game_test
 
 def build_suite():


@@ -22,12 +24,15 @@ def build_suite():
     """
     suite = TestSuite()
     suite.addTest(DocTestSuite(cones))
     """
     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(symmetric_linear_game_test))

+    suite.addTest(DocTestSuite(randomgen))

     slg_tests = TestLoader().loadTestsFromModule(symmetric_linear_game_test)
     suite.addTest(slg_tests)
     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(suite):
     return suite
 
 def run_suite(suite):


@@ -36,4 +41,4 @@ def run_suite(suite):
     packages.
     """
     runner = TextTestRunner(verbosity=1)
     packages.
     """
     runner = TextTestRunner(verbosity=1)

-    runner.run(suite)
+    return runner.run(suite)