Changeset 1888

Timestamp:

Oct 10, 2005, 4:32:26 PM (19 years ago)

Author:

duncan

Message:

added test for checking exit status when using least_squares.py in the command line.

Location:

inundation/pyvolution

Files:

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

inundation/pyvolution/least_squares.py

@@ -1265 +1265 @@
     """
     import os, sys
-    usage = "usage: %s mesh_input.tsh point.xya mesh_output.tsh [expand|no_expand][vervose|non_verbose] [alpha]"\
+    usage = "usage: %s mesh_input.tsh point.xya mesh_output.tsh [expand|no_expand][vervose|non_verbose] [alpha] [display_errors|no_display_errors]"\
             %os.path.basename(sys.argv[0])
 
@@ -1294 +1294 @@
             alpha = DEFAULT_ALPHA
 
+        # This is used more for testing
+        if len(sys.argv) > 7:
+            if sys.argv[7][0] == "n" or sys.argv[5][0] == "N":
+                display_errors = False
+            else:
+                display_errors = True
+            
         t0 = time.time()
         try:
@@ -1301 +1308 @@
                          alpha,
                          verbose= verbose,
-                         expand_search = expand_search)
+                         expand_search = expand_search,
+                         display_errors = display_errors)
         except IOError,e:
-            import sys; sys.exit()
+            import sys; sys.exit(1)
 
         print 'That took %.2f seconds' %(time.time()-t0)

inundation/pyvolution/test_least_squares.py

@@ -1541 +1541 @@
         os.remove(mesh_file)
         os.remove(point_file)
+  
+    def test_fit_to_mesh_file_errorsIV(self):
+        import os
+        status = os.system('python least_squares.py q q q e n 0.9 n')
+        self.failUnless(status  == 1,
+                        'command prompt least_squares.py failed.  Incorect exit status.')
         
     def test_fit_to_msh_netcdf_fileII(self):