diff options
| author | Picca Frédéric-Emmanuel <picca@debian.org> | 2018-03-04 10:20:27 +0100 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2018-03-04 10:20:27 +0100 |
| commit | 270d5ddc31c26b62379e3caa9044dd75ccc71847 (patch) | |
| tree | 55c5bfc851dfce7172d335cd2405b214323e3caf /silx/gui/plot3d/test | |
| parent | e19c96eff0c310c06c4f268c8b80cb33bd08996f (diff) | |
New upstream version 0.7.0+dfsg
Diffstat (limited to 'silx/gui/plot3d/test')
| -rw-r--r-- | silx/gui/plot3d/test/__init__.py | 12 | ||||
| -rw-r--r-- | silx/gui/plot3d/test/testScalarFieldView.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/silx/gui/plot3d/test/__init__.py b/silx/gui/plot3d/test/__init__.py index 2e8c9f4..bd2f7c3 100644 --- a/silx/gui/plot3d/test/__init__.py +++ b/silx/gui/plot3d/test/__init__.py @@ -26,12 +26,13 @@ __authors__ = ["T. Vincent"] __license__ = "MIT" -__date__ = "05/01/2017" +__date__ = "09/11/2017" import logging import os import unittest +from silx.test.utils import test_options _logger = logging.getLogger(__name__) @@ -40,15 +41,14 @@ _logger = logging.getLogger(__name__) def suite(): test_suite = unittest.TestSuite() - if os.environ.get('WITH_GL_TEST', 'True') == 'False': + if not test_options.WITH_GL_TEST: # Explicitly disabled tests - _logger.warning( - "silx.gui.plot3d tests disabled (WITH_GL_TEST=False)") + msg = "silx.gui.plot3d tests disabled: %s" % test_options.WITH_GL_TEST_REASON + _logger.warning(msg) class SkipPlot3DTest(unittest.TestCase): def runTest(self): - self.skipTest( - "silx.gui.plot3d tests disabled (WITH_GL_TEST=False)") + self.skipTest(test_options.WITH_GL_TEST_REASON) test_suite.addTest(SkipPlot3DTest()) return test_suite diff --git a/silx/gui/plot3d/test/testScalarFieldView.py b/silx/gui/plot3d/test/testScalarFieldView.py index 5ad4051..43d401f 100644 --- a/silx/gui/plot3d/test/testScalarFieldView.py +++ b/silx/gui/plot3d/test/testScalarFieldView.py @@ -25,7 +25,7 @@ __authors__ = ["T. Vincent"] __license__ = "MIT" -__date__ = "11/07/2017" +__date__ = "17/01/2018" import logging @@ -33,7 +33,7 @@ import unittest import numpy -from silx.test.utils import ParametricTestCase +from silx.utils.testutils import ParametricTestCase from silx.gui.test.utils import TestCaseQt from silx.gui import qt |