diff --git a/interfaces/cython/cantera/test/test_func1.py b/interfaces/cython/cantera/test/test_func1.py index 6a13f3951..22c907446 100644 --- a/interfaces/cython/cantera/test/test_func1.py +++ b/interfaces/cython/cantera/test/test_func1.py @@ -1,8 +1,8 @@ -import unittest import numpy as np import cantera as ct from . import utilities +from .utilities import unittest class TestFunc1(utilities.CanteraTest): def test_function(self): diff --git a/interfaces/cython/cantera/test/test_reactor.py b/interfaces/cython/cantera/test/test_reactor.py index 7a290dd9d..fd07e653e 100644 --- a/interfaces/cython/cantera/test/test_reactor.py +++ b/interfaces/cython/cantera/test/test_reactor.py @@ -1,5 +1,5 @@ import numpy as np -import unittest +from .utilities import unittest import re import cantera as ct diff --git a/interfaces/cython/cantera/test/test_thermo.py b/interfaces/cython/cantera/test/test_thermo.py index 8f1a92e59..dcfc870c4 100644 --- a/interfaces/cython/cantera/test/test_thermo.py +++ b/interfaces/cython/cantera/test/test_thermo.py @@ -1,4 +1,4 @@ -import unittest +from .utilities import unittest import numpy as np import cantera as ct diff --git a/interfaces/cython/cantera/test/test_transport.py b/interfaces/cython/cantera/test/test_transport.py index 3c336342c..51e751856 100644 --- a/interfaces/cython/cantera/test/test_transport.py +++ b/interfaces/cython/cantera/test/test_transport.py @@ -1,4 +1,4 @@ -import unittest +from .utilities import unittest import numpy as np import cantera as ct diff --git a/interfaces/cython/cantera/test/utilities.py b/interfaces/cython/cantera/test/utilities.py index 1f87a8b3e..7d088ed30 100644 --- a/interfaces/cython/cantera/test/utilities.py +++ b/interfaces/cython/cantera/test/utilities.py @@ -1,5 +1,13 @@ import numpy as np -import unittest +import sys + +if sys.version_info[:2] < (2,7): + # unittest2 is a backport of the new features added to the + # unittest testing framework in Python 2.7. See + # https://pypi.python.org/pypi/unittest2 + import unittest2 as unittest +else: + import unittest class CanteraTest(unittest.TestCase): diff --git a/test/python/runCythonTests.py b/test/python/runCythonTests.py index cab73baf4..8841418aa 100644 --- a/test/python/runCythonTests.py +++ b/test/python/runCythonTests.py @@ -15,7 +15,7 @@ if sys.version_info[0] == 3: else: sys.path.insert(0, os.sep.join(cantera_root + ['build', 'python2'])) -import unittest +from cantera.test.utilities import unittest import cantera if __name__ == '__main__':