Changeset d3619421 in sasview

Timestamp:

Jul 10, 2008 11:12:37 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

85bf28c

Parents:

c45976b

Message:

modifications on test and loader

Location:

DataLoader

Files:

• loader.py (modified) (5 diffs)
• test/testLoad.py (modified) (1 diff)
• test/testplugings.py (modified) (2 diffs)

DataLoader/loader.py

@@ -10 +10 @@
 logging.basicConfig(level=logging.ERROR,
                     format='%(asctime)s %(levelname)s %(message)s',
-                    filename='loader_log.txt',
+                    filename='test_log.txt',
                     filemode='w')
 
@@ -85 +85 @@
                 plugin reader.
                 if an extension is not specified and a reader does not contain a field
-                ext , a ValueError "missing extension" is raised.
+                ext , a warning is printed in test_log.txt file.
                 @note: when called without parameters __setitem__ will try to load
                 readers inside a "readers" directory 
@@ -92 +92 @@
             """
             if dir==None:
-                dir = os.path.join(os.path.dirname(os.path.abspath(__file__)),'readers')
+                dir = 'readers'
+            dir=os.path.join(os.path.dirname(os.path.abspath(__file__)),dir)
                 
             if (reader==None and  ext==None) or dir:#1st load
@@ -100 +101 @@
                 if os.path.isdir('../'+dir):
                     plugReader=_findReaders('../'+dir)
-                else:
-                    if os.path.isdir('../DataLoader/'+dir):
-                        os.chdir(os.path.abspath('../DataLoader/'+dir))# change the current 
-                        plugReader=_findReaders(dir)
-                       
+ 
+                
                 if plugReader !=None:
+                    list=[]
                     for preader in plugReader:# for each modules takes list of extensions
                         try:
                             list=preader.ext
-                        except:
-                            raise AttributeError," %s instance has no attribute 'ext'"\
-                            %(preader.__class__)
-                        for item in list:
-                            ext=item
-                            if ext not in self.readers:#assign extension with its reader
-                                self.readers[ext] = []
-                            self.readers[ext].insert(0,preader)
+                        except AttributeError,msg:
+                            logging.warning(msg)
+                            pass
+                            #raise  AttributeError," %s instance has no attribute 'ext'"\
+                            #%(preader.__class__)
+                        if list !=[]:
+                            for item in list:
+                                ext=item
+                                if ext not in self.readers:#assign extension with its reader
+                                    self.readers[ext] = []
+                                self.readers[ext].insert(0,preader)
             #Reader and extension are given
             elif reader !=None and  ext !=None:
@@ -182 +184 @@
                 return self.readers[ext]
             except:
-                
+                logging.warning("Unknown file type '%s'"%ext)
                 raise RuntimeError, "Unknown file type '%s'"%ext
                 

DataLoader/test/testLoad.py

@@ -21 +21 @@
 import os.path
 class testLoader(unittest.TestCase):
-   
+    logging.debug("Inside testLoad module")
         
     """ test fitting """

DataLoader/test/testplugings.py

@@ -11 +11 @@
 import os.path
 import os 
+import logging
+logging.basicConfig(level=logging.DEBUG,
+                    format='%(asctime)s %(levelname)s %(message)s',
+                    filename='test_log.txt',
+                    filemode='w')
 class testLoader(unittest.TestCase):
-    L=Loader()
+    
+    try:L=Loader()
+    except AttributeError,msg:
+        logging.warning(msg)
     def testplugin(self):
         """ test loading with readers"""
@@ -19 +27 @@
         self.assertEqual(self.L.__contains__('.png'),True)
         self.assertEqual(self.L.__contains__('.txt'),True)
+         #tested corrupted file.asc
+        try:self.L.load('MAR07232_rest.ASC')
+        except AttributeError,msg:
+           #logging.log(10,str(msg))
+           logging.warning(str(msg))
     def testplugin1(self):
         """ test loading with plugging"""