Clean up a bit of the import mess.

[dunshire.git] / test / suite.py

diff --git a/test/suite.py b/test/suite.py
index bfd0011ff3b1a40d9e1e82b238766e65e179a8d9..7051b9c3ceb3ab28b9dc1d90939d99537123f406 100644 (file)
--- a/test/suite.py
+++ b/test/suite.py
@@ -10,17 +10,17 @@ 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
+addsitedir('./src')
+from dunshire import cones
+from dunshire import errors
+from dunshire import matrices
+from dunshire import games
 
 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))
+suite.addTest(DocTestSuite(games))
+suite.addTest(TestLoader().loadTestsFromModule(games))
 runner = TextTestRunner(verbosity=2)
 runner.run(suite)