Clean up code (#1983)

Jürgen Knödlseder
1 parent 4218166f
Showing 6 changed files with 15 additions and 17 deletions
ChangeLog
NEWS
test/test_ctbin.py
test/test_examples.py.in
test/test_python_cscripts.py
test/test_python_ctools.py
-2017-03-28
+2017-04-04
  
         * Version 1.3.0 released
         ========================
  
+        Raise exception instead of exiting with return code in Python tests (#1983)
         Support of map cubes lying outside RoI in ctobssim 
         Support energy boundary FITS file in ctmapcube (#1978)
         Add csebins script (#1976)
 New Features and Important Changes in ctools 1.3.0.dev1
  
-28 March 2017
+4 April 2017
  
  
 Introduction
@@ -11,7 +11,9 @@ ctools release with respect to the precedent release.
  
 Configuration
 -------------
-None
+The Python unit tests now raise exceptions instead of exiting with a non-
+zero return code so that the user is not thrown out of Python after calling
+ctools.test() and cscripts.test() (#1983).
  
  
 Python interface
@@ -30,7 +30,7 @@ from testing import test
 class Test(test):
     """
     Test class for ctbin tool
-    
+
     This test class makes unit tests for the ctbin tool by using it from
     the command line and from Python.
     """
@@ -87,8 +87,7 @@ class Test(test):
  
         # Load counts cube and check content.
         evt = gammalib.GCTAEventCube('cntmap_cmd1.fits')
-        #JKself._check_cube(evt, 5542)
-        self._check_cube(evt, 5543)
+        self._check_cube(evt, 5542)
  
         # Setup ctbin command
         cmd = ctbin+' inobs="events_that_do_not_exist.fits"'+ \
@@ -281,7 +280,7 @@ class Test(test):
     def _check_observation(self, ctbin, nevents, multiplier=1):
         """
         Check content of an observation
-        
+
         Parameters
         ----------
         ctbin : `~ctools.ctbin`
@@ -317,7 +316,7 @@ class Test(test):
     def _check_cube(self, cube, nevents, multiplier=1):
         """
         Check content of event cube
-        
+
         Parameters
         ----------
         cube : `~gammalib.GCTAEventCube`
@@ -487,8 +487,7 @@ class Test(gammalib.GPythonTestSuite):
         args = '-p example_show_pointings.eps %s/obs_unbinned.xml' % self._datadir
  
         # Execute script
-        #JKself._execute_python('show_pointings', args=args)
-        self._execute_python('show_pointing', args=args)
+        self._execute_python('show_pointings', args=args)
  
         # Return
         return
@@ -533,7 +532,6 @@ if __name__ == &#39;__main__&#39;:
     else:
         rc = 1
  
-    # Exit with return code
+    # Raise an exception in case of failure
     if not success:
         raise RuntimeError('At least one error occured during the test.')
-    #sys.exit(rc)
@@ -184,10 +184,9 @@ def test(installed=False, debug=False):
     if installed:
         os.system('rm -rf %s' % (path))
  
-    # Exit with return code
+    # Raise an exception in case of failure
     if not success:
         raise RuntimeError('At least one error occured during the test.')
-    #sys.exit(rc)
  
  
 # ======================== #
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This scripts performs unit tests for the ctools package
 #
-# Copyright (C) 2012-2016 Juergen Knoedlseder
+# Copyright (C) 2012-2017 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -143,10 +143,9 @@ def test(installed=False):
     if installed:
         os.system('rm -rf %s' % (path))
  
-    # Throw an exception in case of failure
+    # Raise an exception in case of failure
     if not success:
         raise RuntimeError('At least one error occured during the test.')
-    #sys.exit(rc)
  
  
 # ======================== #