Unit testing fixes

sciunit/unit_test/__main__.py

@@ -2,7 +2,7 @@
 
 import sys
 import unittest
-from . import * # Import all the tests from the unit_test module
+from .active import * # Import all the tests from the unit_test.active module
 
 def main():
     buffer = 'buffer' in sys.argv

sciunit/unit_test/active.py

@@ -1,11 +1,9 @@
 """
 All active unit tests for SciUnit. This module is the default target of
-for testing in `test.sh`. Modify this file if you want to add or remove
+for testing in `__main__.py`. Modify this file if you want to add or remove
 tests located in other modules.
 """
 
-import unittest
-
 from .backend_tests import *
 from .command_line_tests import *
 from .config_tests import *

sciunit/unit_test/base.py

@@ -1,18 +1,24 @@
-"""Abstract base class from some SciUnit unit test cases"""
+"""Common imports for many unit tests in this directory"""
 
-from sciunit import TestSuite
-from sciunit.tests import RangeTest
-from sciunit.models.examples import UniformModel
+import matplotlib as mpl
+import sys
+import unittest
 
+OSX = sys.platform == 'darwin'
+if OSX or 'Qt' in mpl.rcParams['backend']:
+    mpl.use('Agg')  # Avoid any problems with Macs or headless displays.
 
 class SuiteBase(object):
     """Abstract base class for testing suites and scores"""
 
     def setUp(self):
+        from sciunit.models.examples import UniformModel
+        from sciunit.tests import RangeTest
         self.M = UniformModel
         self.T = RangeTest
 
     def prep_models_and_tests(self):
+        from sciunit import TestSuite
         t1 = self.T([2, 3], name='test1')
         t2 = self.T([5, 6])
         m1 = self.M(2, 3)

sciunit/unit_test/test_tests.py

@@ -9,7 +9,7 @@
 from sciunit.scores import FloatScore
 from sciunit.capabilities import ProducesNumber
 
-from sciunit.unit_test.base import SuiteBase
+from .base import SuiteBase
 
 class TestsTestCase(unittest.TestCase):
     """Unit tests for the sciunit module"""

test.sh

@@ -2,8 +2,6 @@ pip install coveralls
 if [ ! -d "../scidash" ]; then
   git clone -b cosmosuite http://github.com/scidash/scidash ../scidash
 fi
-UNIT_TEST_SUITE="sciunit.unit_test.active buffer"
-# Fundamental Python bug prevents this latter method from allowing
-# some notebook tests to pass.
-#UNIT_TEST_SUITE="setup.py test"
+# All tests listed in sciunit/unit_test/active.py will be run
+UNIT_TEST_SUITE="sciunit.unit_test buffer"
 coverage run -m --source=. --omit=*unit_test*,setup.py,.eggs $UNIT_TEST_SUITE