From 3f095bf7e66abb63960957f20271facdc400b595 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 25 Feb 2016 12:28:30 +0100 Subject: [PATCH] Remove catching of exception text as this does not work for Python < 2.6. --- test/test_ctbin.py | 12 ++++++++---- test/test_ctbkgcube.py | 12 ++++++++---- test/test_ctbutterfly.py | 12 ++++++++---- test/test_ctcubemask.py | 12 ++++++++---- test/test_cterror.py | 12 ++++++++---- test/test_ctexpcube.py | 12 ++++++++---- test/test_ctlike.py | 12 ++++++++---- test/test_ctmodel.py | 12 ++++++++---- test/test_ctobssim.py | 24 ++++++++++++++++-------- test/test_ctpsfcube.py | 12 ++++++++---- test/test_ctselect.py | 12 ++++++++---- test/test_ctskymap.py | 12 ++++++++---- test/test_cttsmap.py | 12 ++++++++---- test/test_ctulimit.py | 12 ++++++++---- 14 files changed, 120 insertions(+), 60 deletions(-) diff --git a/test/test_ctbin.py b/test/test_ctbin.py index cc2f80d..5368618 100755 --- a/test/test_ctbin.py +++ b/test/test_ctbin.py @@ -83,8 +83,10 @@ class Test(gammalib.GPythonTestSuite): try: bin.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctbin: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctbin: %s." % (e,) + except: + msg = "Exception occured in ctbin." self.test_try_failure(msg) # Save counts cube @@ -92,8 +94,10 @@ class Test(gammalib.GPythonTestSuite): try: bin.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving counts cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving counts cube: %s." % (e,) + except: + msg = "Exception occured in saving counts cube." self.test_try_failure(msg) # Return diff --git a/test/test_ctbkgcube.py b/test/test_ctbkgcube.py index 980cce2..5455980 100755 --- a/test/test_ctbkgcube.py +++ b/test/test_ctbkgcube.py @@ -91,8 +91,10 @@ class Test(gammalib.GPythonTestSuite): try: bkgcube.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctbkgcube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctbkgcube: %s." % (e,) + except: + msg = "Exception occured in ctbkgcube." self.test_try_failure(msg) # Save background cube @@ -100,8 +102,10 @@ class Test(gammalib.GPythonTestSuite): try: bkgcube.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving background cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving background cube: %s." % (e,) + except: + msg = "Exception occured in saving background cube." self.test_try_failure(msg) # Return diff --git a/test/test_ctbutterfly.py b/test/test_ctbutterfly.py index 8f1acfa..4516d25 100755 --- a/test/test_ctbutterfly.py +++ b/test/test_ctbutterfly.py @@ -81,8 +81,10 @@ class Test(gammalib.GPythonTestSuite): try: butterfly.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctbutterfly: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctbutterfly: %s." % (e,) + except: + msg = "Exception occured in ctbutterfly." self.test_try_failure(msg) # Save results @@ -90,8 +92,10 @@ class Test(gammalib.GPythonTestSuite): try: butterfly.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving butterfly diagram: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving butterfly diagram: %s." % (e,) + except: + msg = "Exception occured in saving butterfly diagram." self.test_try_failure(msg) # Return diff --git a/test/test_ctcubemask.py b/test/test_ctcubemask.py index b081f7c..447ab41 100755 --- a/test/test_ctcubemask.py +++ b/test/test_ctcubemask.py @@ -79,8 +79,10 @@ class Test(gammalib.GPythonTestSuite): try: mask.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctcubemask: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctcubemask: %s." % (e,) + except: + msg = "Exception occured in ctcubemask." self.test_try_failure(msg) # Save counts cube @@ -88,8 +90,10 @@ class Test(gammalib.GPythonTestSuite): try: mask.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving counts cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving counts cube: %s." % (e,) + except: + msg = "Exception occured in saving counts cube." self.test_try_failure(msg) # Return diff --git a/test/test_cterror.py b/test/test_cterror.py index 741aec7..d7128a2 100755 --- a/test/test_cterror.py +++ b/test/test_cterror.py @@ -80,8 +80,10 @@ class Test(gammalib.GPythonTestSuite): try: error.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in cterror: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in cterror: %s." % (e,) + except: + msg = "Exception occured in cterror." self.test_try_failure(msg) # Save results @@ -89,8 +91,10 @@ class Test(gammalib.GPythonTestSuite): try: error.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving results: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving results: %s." % (e,) + except: + msg = "Exception occured in saving results." self.test_try_failure(msg) # Return diff --git a/test/test_ctexpcube.py b/test/test_ctexpcube.py index 8c31f42..76bf41e 100755 --- a/test/test_ctexpcube.py +++ b/test/test_ctexpcube.py @@ -88,8 +88,10 @@ class Test(gammalib.GPythonTestSuite): try: expcube.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctexpcube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctexpcube: %s." % (e,) + except: + msg = "Exception occured in ctexpcube." self.test_try_failure(msg) # Save exposure cube @@ -97,8 +99,10 @@ class Test(gammalib.GPythonTestSuite): try: expcube.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving exposure cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving exposure cube: %s." % (e,) + except: + msg = "Exception occured in saving exposure cube." self.test_try_failure(msg) # Return diff --git a/test/test_ctlike.py b/test/test_ctlike.py index 20e8c8b..7d66653 100755 --- a/test/test_ctlike.py +++ b/test/test_ctlike.py @@ -78,8 +78,10 @@ class Test(gammalib.GPythonTestSuite): try: like.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctlike: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctlike: %s." % (e,) + except: + msg = "Exception occured in ctlike." self.test_try_failure(msg) # Save results @@ -87,8 +89,10 @@ class Test(gammalib.GPythonTestSuite): try: like.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving results: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving results: %s." % (e,) + except: + msg = "Exception occured in saving results." self.test_try_failure(msg) # Return diff --git a/test/test_ctmodel.py b/test/test_ctmodel.py index 1202913..7497183 100755 --- a/test/test_ctmodel.py +++ b/test/test_ctmodel.py @@ -96,8 +96,10 @@ class Test(gammalib.GPythonTestSuite): try: model.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctmodel: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctmodel: %s." % (e,) + except: + msg = "Exception occured in ctmodel." self.test_try_failure(msg) # Save counts cube @@ -105,8 +107,10 @@ class Test(gammalib.GPythonTestSuite): try: model.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving model cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving model cube: %s." % (e,) + except: + msg = "Exception occured in saving model cube." self.test_try_failure(msg) # Return diff --git a/test/test_ctobssim.py b/test/test_ctobssim.py index 80a9198..1b36ae2 100755 --- a/test/test_ctobssim.py +++ b/test/test_ctobssim.py @@ -84,8 +84,10 @@ class Test(gammalib.GPythonTestSuite): try: sim.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctobssim: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctobssim: %s." % (e,) + except: + msg = "Exception occured in ctobssim." self.test_try_failure(msg) # Retrieve observation and check content @@ -105,8 +107,10 @@ class Test(gammalib.GPythonTestSuite): try: sim.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving events: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving events: %s." % (e,) + except: + msg = "Exception occured in saving events." self.test_try_failure(msg) # Test ctobssim on observation container @@ -126,8 +130,10 @@ class Test(gammalib.GPythonTestSuite): try: sim.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctobssim: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctobssim: %s." % (e,) + except: + msg = "Exception occured in ctobssim." self.test_try_failure(msg) # Retrieve observation and check content @@ -138,8 +144,10 @@ class Test(gammalib.GPythonTestSuite): try: sim.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving events: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving events: %s." % (e,) + except: + msg = "Exception occured in saving events." self.test_try_failure(msg) # Setup observation container diff --git a/test/test_ctpsfcube.py b/test/test_ctpsfcube.py index 996b2eb..80802bb 100755 --- a/test/test_ctpsfcube.py +++ b/test/test_ctpsfcube.py @@ -90,8 +90,10 @@ class Test(gammalib.GPythonTestSuite): try: psfcube.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctpsfcube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctpsfcube: %s." % (e,) + except: + msg = "Exception occured in ctpsfcube." self.test_try_failure(msg) # Save PSF cube @@ -99,8 +101,10 @@ class Test(gammalib.GPythonTestSuite): try: psfcube.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving PSF cube: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving PSF cube: %s." % (e,) + except: + msg = "Exception occured in saving PSF cubes." self.test_try_failure(msg) # Return diff --git a/test/test_ctselect.py b/test/test_ctselect.py index b9ca40e..cb621b2 100755 --- a/test/test_ctselect.py +++ b/test/test_ctselect.py @@ -79,8 +79,10 @@ class Test(gammalib.GPythonTestSuite): try: select.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctselect: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctselect: %s." % (e,) + except: + msg = "Exception occured in ctselect." self.test_try_failure(msg) # Save events @@ -88,8 +90,10 @@ class Test(gammalib.GPythonTestSuite): try: select.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving events: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving events: %s." % (e,) + except: + msg = "Exception occured in saving events." self.test_try_failure(msg) # Return diff --git a/test/test_ctskymap.py b/test/test_ctskymap.py index 676ab21..1e8aec6 100755 --- a/test/test_ctskymap.py +++ b/test/test_ctskymap.py @@ -81,8 +81,10 @@ class Test(gammalib.GPythonTestSuite): try: skymap.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctskymap: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctskymap: %s." % (e,) + except: + msg = "Exception occured in ctskymap." self.test_try_failure(msg) # Save counts cube @@ -90,8 +92,10 @@ class Test(gammalib.GPythonTestSuite): try: skymap.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving sky map: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving sky map: %s." % (e,) + except: + msg = "Exception occured in saving sky map." self.test_try_failure(msg) # Return diff --git a/test/test_cttsmap.py b/test/test_cttsmap.py index 300bedf..e0034a3 100755 --- a/test/test_cttsmap.py +++ b/test/test_cttsmap.py @@ -86,8 +86,10 @@ class Test(gammalib.GPythonTestSuite): try: tsmap.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in cttsmap: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in cttsmap: %s." % (e,) + except: + msg = "Exception occured in cttsmap." self.test_try_failure(msg) # Save results @@ -95,8 +97,10 @@ class Test(gammalib.GPythonTestSuite): try: tsmap.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving results: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving results: %s." % (e,) + except: + msg = "Exception occured in saving results." self.test_try_failure(msg) # Return diff --git a/test/test_ctulimit.py b/test/test_ctulimit.py index c405c8b..6f1391c 100755 --- a/test/test_ctulimit.py +++ b/test/test_ctulimit.py @@ -78,8 +78,10 @@ class Test(gammalib.GPythonTestSuite): try: ulimit.run() self.test_try_success() - except Exception as e: - msg = "Exception occured in ctulimit: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in ctulimit: %s." % (e,) + except: + msg = "Exception occured in ctulimit." self.test_try_failure(msg) # Save results @@ -87,8 +89,10 @@ class Test(gammalib.GPythonTestSuite): try: ulimit.save() self.test_try_success() - except Exception as e: - msg = "Exception occured in saving results: %s." % (e,) + #except Exception as e: + # msg = "Exception occured in saving results: %s." % (e,) + except: + msg = "Exception occured in saving results." self.test_try_failure(msg) # Return -- libgit2 0.21.4