Changeset 1872

Timestamp:

Oct 6, 2005, 10:39:24 AM (19 years ago)

Author:

ole

Message:

Worked on exception catching. A test still fails on cyclone

Location:

inundation/pyvolution

Files:

• least_squares.py (modified) (1 diff)
• test_least_squares.py (modified) (2 diffs)

inundation/pyvolution/least_squares.py

@@ -109 +109 @@
         if display_errors:
             print "Could not load bad file. ", e
-        import sys; sys.exit()
+        raise IOError  #Re-raise exception        
 
     point_coordinates = point_dict['pointlist']

inundation/pyvolution/test_least_squares.py

@@ -1463 +1463 @@
             fit_to_mesh_file(mesh_file, point_file,
                              mesh_output_file, display_errors = False)
-        except SystemExit:  pass
+        except IOError:
+            pass
         else:
-            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+            #self.failUnless(0 ==1,  'Bad file did not raise error!')
+            raise 'Bad file did not raise error!'
+            
         #clean up
         os.remove(mesh_file)
@@ -1527 +1530 @@
         #There might be platform issus (Unix/Windows)
         #In any case, the call itself does not raise an exception on cyclone - why?
-        mesh_output_file = "e:\new_triangle.tsh" 
+        mesh_output_file = "e:\new_triangle.tsh"
+        fit_to_mesh_file(mesh_file, point_file,
+                         mesh_output_file, display_errors = False)        
         try:
             fit_to_mesh_file(mesh_file, point_file,