update test suite for py34 using stable poppy

mperrin · Apr 12, 2015 · fda37c1 · fda37c1
1 parent ad1be9d
commit fda37c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/webbpsf/tests/test_errorhandling.py b/webbpsf/tests/test_errorhandling.py
@@ -16,7 +16,12 @@
 from .. import webbpsf_core
 from .. import utils
 import poppy
-from poppy.tests.test_errorhandling import _exception_message_starts_with
+
+def _exception_message_starts_with(excinfo, message_body):
+    if sys.version_info.major<3:
+        return excinfo.value.message.startswith(message_body)
+    else:
+        return excinfo.value.args[0].startswith(message_body)
 
 
 try:

diff --git a/webbpsf/tests/test_nircam.py b/webbpsf/tests/test_nircam.py
@@ -9,7 +9,7 @@
 
 from .. import webbpsf_core
 import poppy
-from poppy.tests.test_errorhandling import _exception_message_starts_with
+from .test_errorhandling import _exception_message_starts_with
 
 
 #------------------    NIRCam Tests    ----------------------------

diff --git a/webbpsf/tests/test_utils.py b/webbpsf/tests/test_utils.py
@@ -13,7 +13,7 @@
 _log = logging.getLogger('test_webbpsf')
 _log.addHandler(logging.NullHandler())
 
-from poppy.tests.test_errorhandling import _exception_message_starts_with
+from .test_errorhandling import _exception_message_starts_with
 
 from .. import webbpsf_core
 from .. import utils

diff --git a/webbpsf/tests/test_webbpsf.py b/webbpsf/tests/test_webbpsf.py
@@ -11,7 +11,7 @@
 
 from .. import webbpsf_core
 import poppy
-from poppy.tests.test_errorhandling import _exception_message_starts_with
+from .test_errorhandling import _exception_message_starts_with