Changeset 1869

Timestamp:

Oct 6, 2005, 10:20:31 AM (19 years ago)

Author:

ole

Message:

Investigated error conditions in least_squares.
NOTE: A test is currently failing

Location:

inundation/pyvolution

Files:

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

inundation/pyvolution/least_squares.py

@@ -81 +81 @@
                  concatinate_attributelist
 
-    
+
     try:
         mesh_dict = import_mesh_file(mesh_file)
@@ -87 +87 @@
         if display_errors:
             print "Could not load bad file. ", e
-        import sys; sys.exit()
+        raise IOError  #Re-raise exception
+        
     vertex_coordinates = mesh_dict['vertices']
     triangles = mesh_dict['triangles']

inundation/pyvolution/test_least_squares.py

@@ -1491 +1491 @@
             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!')        
+            raise 'Bad file did not raise error!'
+            
         #clean up
         os.remove(mesh_file)
@@ -1522 +1524 @@
         fd.close()
 
-        mesh_output_file = "e:\new_triangle.tsh" #Deliberately bad file
+        #FIXME (Ole): Is this a deliberately bad filename to invoke the error?
+        #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" 
         try:
             fit_to_mesh_file(mesh_file, point_file,
                              mesh_output_file, display_errors = False)
-        except SystemExit:
+        except IOError:
             pass
         else:
-            #self.failUnless(0 ==1,  'Bad file did not raise error!')
-            #FIXME (Ole) Did not work on my computer: This one does:
             raise 'Bad file did not raise error!'