Changeset 4924

Timestamp:

Jan 10, 2008, 10:48:21 AM (16 years ago)

Author:

nick

Message:

Added test for screen_catcher in data_manager.py. Also added a print statement telling user that output will now be store in a file when using screen_catcher and added file.close() to the write function in screen_catcher.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (6 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5257 +5257 @@
         
 def start_screen_catcher(dir_name, myid='', numprocs='', extra_info='',
-                         verbose=False):
+                         verbose=True):
     """ 
     Used to store screen output and errors to file, if run on multiple 
@@ -5276 +5276 @@
       #  if verbose: print "myid", myid
         mkdir (dir_name,0777)
+#    print 'helloa'
     if myid <>'':
         myid = '_'+str(myid)
@@ -5282 +5283 @@
     if extra_info <>'':
         extra_info = '_'+str(extra_info)
+#    print 'hello1'
     screen_output_name = dir_name + "screen_output%s%s%s.txt" %(myid,
                                                                 numprocs,
@@ -5288 +5290 @@
                                                               numprocs,
                                                               extra_info)
-    if verbose: print screen_output_name
+
+    if verbose: print 'Starting ScreenCatcher, all output will be stored in %s' \
+                                     %(screen_output_name)
     #used to catch screen output to file
     sys.stdout = Screen_Catcher(screen_output_name)
@@ -5300 +5304 @@
     def __init__(self, filename):
         self.filename = filename
- 
+#        print 'init'
         if exists(self.filename)is True:
             print'Old existing file "%s" has been deleted' %(self.filename)
@@ -5308 +5312 @@
         fid = open(self.filename, 'a')
         fid.write(stuff)
-
+        fid.close()
+        
 def copy_code_files(dir_name, filename1, filename2=None):
     """Copies "filename1" and "filename2" to "dir_name". Very useful for 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7356 +7356 @@
         assert len(iterate)==4
 
+    def test_screen_catcher(self):
+    
+        stdout_orginal = sys.stdout
+        stderr_orginal = sys.stderr
+        
+        output_dir = tempfile.mkdtemp('','output_test')
+        #print output_dir
+        start_screen_catcher(output_dir+sep,verbose=False)
+        
+        print 'hello screen catcher'
+        print 'goodbye screen catcher'
+        
+        sys.stdout = stdout_orginal
+        sys.stderr = stderr_orginal
+        
+        output_file = output_dir+sep+'screen_output.txt'
+        assert access(output_file,F_OK)
+        
+        fid = open(output_file)
+        file_line1 = fid.readline()
+        file_line2 = fid.readline()
+        
+        #print 'file contents',file_line1, file_line2
+        assert (file_line1 == 'hello screen catcher\n')
+        assert (file_line2 == 'goodbye screen catcher\n')
         
         
@@ -7365 +7390 @@
 
     #suite = unittest.makeSuite(Test_Data_Manager,'test_export_gridII')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_header')
+#    suite = unittest.makeSuite(Test_Data_Manager,'test_screen_catcher')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs_ungridded_holeII')