Separate the tests that hit the database from the rest of the tests.

[dead/census-tools.git] / bin / run_tests

diff --git a/bin/run_tests b/bin/run_tests
index 69b9a8818a541ee838a2753b50e94a05ca3afe0a..4ce94e771237ce22dfc15be61bf30cb5c9643cb0 100755 (executable)
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -5,13 +5,16 @@ import sys, os, site
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
 import unittest
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
 import unittest

+import Census

 from Tests.Unit import CensusTest
 from Tests.Unit import CensusTest

+from Tests.Unit import DistributionTest

 from Tests.Unit import FileUtilsTest
 from Tests.Unit import GeometryTest
 from Tests.Unit import KMLTest
 from Tests.Unit import LEHDTest
 from Tests.Unit import SummaryFile1Test
 from Tests.Unit import StringUtilsTest
 from Tests.Unit import FileUtilsTest
 from Tests.Unit import GeometryTest
 from Tests.Unit import KMLTest
 from Tests.Unit import LEHDTest
 from Tests.Unit import SummaryFile1Test
 from Tests.Unit import StringUtilsTest

+from Tests.Unit import UniformDistributionTest

 
 suite = unittest.TestSuite()
 suite.addTest(CensusTest.suite())
 
 suite = unittest.TestSuite()
 suite.addTest(CensusTest.suite())


@@ -21,4 +24,16 @@ suite.addTest(KMLTest.suite())
 suite.addTest(SummaryFile1Test.suite())
 suite.addTest(StringUtilsTest.suite())
 suite.addTest(LEHDTest.suite())
 suite.addTest(SummaryFile1Test.suite())
 suite.addTest(StringUtilsTest.suite())
 suite.addTest(LEHDTest.suite())

+suite.addTest(UniformDistributionTest.suite())
+suite.addTest(DistributionTest.suite())

 unittest.TextTestRunner(verbosity=2).run(suite)
 unittest.TextTestRunner(verbosity=2).run(suite)

+
+try:
+    # The Census.Database initialization will raise an exception
+    # if the database cannot be accessed.
+    cdb = Census.Database()
+    db_suite = unittest.TestSuite()
+    db_suite.addTest(CensusTest.db_suite())
+    unittest.TextTestRunner(verbosity=2).run(db_suite)
+except:
+    pass