Changeset 103

Timestamp:

07/12/13 03:33:46 (7 years ago)

Author:

mjuckes

Message:

added specific file handle tracking test to unit test suite 2

Location:

CCCC/trunk

Files:

• c4.py (modified) (10 diffs)
• unitTestsS1.py (modified) (1 diff)
• unitTestsS2.py (modified) (2 diffs)
• utils_c4.py (modified) (8 diffs)

CCCC/trunk/c4.py

@@ -62 +62 @@
       self.va[v] = {}
       self.va[v]['standard_name'] = 's%s' % v
-      self.va[v]['name'] = v
+      self.va[v]['long_name'] = v
+      self.va[v]['cell_methods'] = 'time: point'
       self.va[v]['units'] = '1'
       self.va[v]['_type'] = 'float32'
@@ -73 +74 @@
     svals = lambda p,q: map( lambda y,z: self.da[y].__setitem__(p, z), dlist, q )
     svals( 'standard_name', ['latitude', 'longitude','time'] )
-    svals( 'name', ['latitude', 'longitude','time'] )
+    svals( 'long_name', ['latitude', 'longitude','time'] )
     svals( 'units', ['degrees_north', 'degrees_east','days since 19590101'] )
 
@@ -213 +214 @@
 
 class checker:
-  def __init__(self, pcfg, cls,reader):
+  def __init__(self, pcfg, cls,reader,abortMessageCount=-1):
     self.info = dummy()
     self.info.pcfg = pcfg
+    self.info.abortMessageCount = abortMessageCount
     self.calendar = 'None'
     self.ncReader = reader
@@ -379 +381 @@
             cl.append( string.split(b, '=' ) )
           self.attributeMappings.append( ('am001',cl, string.split(bb[1],'=') ) )
-    print self.attributeMappings
 
   def getFileLog( self, fn, flf=None ):
@@ -408 +409 @@
 class main:
 
-  def __init__(self,args=None):
+  def __init__(self,args=None,holdExceptions=False,abortMessageCount=-1,printInfo=False,monitorFileHandles = False):
     logDict = {}
+    ecount = 0
     c4i = c4_init(args=args)
     isDummy  = c4i.project[:2] == '__'
@@ -418 +420 @@
     pcfg = config.projectConfig( c4i.project )
     ncReader = fileMetadata(dummy=isDummy)
-    cc = checker(pcfg, c4i.project, ncReader)
+    cc = checker(pcfg, c4i.project, ncReader,abortMessageCount=abortMessageCount)
     rec = recorder( c4i.recordFile, dummy=isDummy )
-    monitorFileHandles = False
     if monitorFileHandles:
-      monitor = utils.sysMonitor()
-    else:
-      monitor = None
+      self.monitor = utils.sysMonitor()
+    else:
+      self.monitor = None
 
     cal = None
-
     c4i.logger.info( 'Starting batch -- number of file: %s' % (len(c4i.flist)) )
   
-    cbv = utils.checkByVar( parent=cc.info,cls=c4i.project,monitor=monitor)
+    cbv = utils.checkByVar( parent=cc.info,cls=c4i.project,monitor=self.monitor)
     cbv.impt( c4i.flist )
+    if printInfo:
+      print cbv.info
 
     for f in c4i.flist:
       if monitorFileHandles:
-        nofhStart = monitor.get_open_fds()
+        nofhStart = self.monitor.get_open_fds()
       fn = string.split(f,'/')[-1]
       c4i.logger.info( 'Starting: %s' % fn )
@@ -468 +470 @@
         if cc.completed:
           c4i.logger.info( 'Done -- error count %s' % cc.errorCount ) 
+          ecount += cc.errorCount
           if cc.errorCount == 0:
             rec.add( f, cc.drs )
@@ -473 +476 @@
             rec.addErr( f, 'ERRORS FOUND | errorCount = %s' % cc.errorCount )
         else:
+          ecount += 20
           c4i.logger.info( 'Done -- testing aborted because of severity of errors' )
           rec.addErr( f, 'ERRORS FOUND AND CHECKS ABORTED' )
@@ -478 +482 @@
         c4i.logger.error("Exception has occured" ,exc_info=1)
         rec.addErr( f, 'ERROR: Exception' )
+        if not holdExceptions:
+          raise
       if monitorFileHandles:
-        nofhEnd = monitor.get_open_fds()
+        nofhEnd = self.monitor.get_open_fds()
         if nofhEnd > nofhStart:
            print 'Open file handles: %s --- %s' % (nofhStart, nofhEnd)
@@ -489 +495 @@
        cbv.setLogDict( logDict )
        cbv.check( recorder=rec, calendar=cc.calendar)
+       try:
+         ecount += cbv.errorCount
+       except:
+         ecount = None
     rec.dumpAll()
+    if printInfo:
+      print 'Error count %s' % ecount
     c4i.hdlr.close()
 if __name__ == '__main__':
-  main()
+  main(printInfo=True)
 
 

CCCC/trunk/unitTestsS1.py

@@ -24 +24 @@
 p.log = log
 p.pcfg = config.projectConfig( "CORDEX" )
+p.abortMessageCount = -1
 
 

CCCC/trunk/unitTestsS2.py

@@ -25 +25 @@
 p = dummy()
 p.log = log
+p.abortMessageCount = -1
 p.pcfg = config.projectConfig( "__dummy" )
 
@@ -32 +33 @@
 
 fn = 'v1_t1_a_b_20060101-20101231.nc'
-testId = '#01.001'
+testId = '#10.001'
 c.check( fn )
 if c.errorCount == 0:
-  print 'Passed [%s] %s: valid file name' % (module,fn)
+  print 'OK [%s] %s: valid file name with project=__dummy' % (module,fn)
 else:
   print 'Failed [%s] %s: valid file name' % (module,fn)
 
 
-main( args=['-p', '__dummy'] )
+testId = '#11.001'
+try:
+  m = main( args=['-p', '__dummy'], monitorFileHandles=True )
+  print 'OK [%s]: dummy run completed without exception' % testId
+except:
+  print 'Failed [%s]: dummy run triggered exception' % testId
+  raise
+
+testId = '#11.002'
+if m.monitor.fhCountMax < 10:
+  print 'OK [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
+else:
+  print 'Failed [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
+
+testId = '#11.003'
+try:
+  m = main( args=['-p', '__dummy'], abortMessageCount=10 )
+  print 'Failed [%s]: did not trigger exception' % testId
+except:
+  print 'OK [%s]: attempt to trigger exception successful' % testId

CCCC/trunk/utils_c4.py

@@ -85 +85 @@
     self.cls = cls
     self.project = cls
+    self.abortMessageCount = parent.abortMessageCount
     self.monitor = monitor
     ## check done earlier
@@ -103 +104 @@
 #######################################
     self.checks = ()
+    self.messageCount = 0
     self.init()
 
@@ -109 +111 @@
 
   def logMessage(self, msg, error=False ):
+    self.messageCount += 1
+    assert self.abortMessageCount < 0 or self.abortMessageCount > self.messageCount, 'Raising error [TESTX01], perhaps for testing'
     if self.parent != None and self.parent.log != None:
        if error:
@@ -677 +681 @@
      self.varInfo = {}
      self.varcons = {}
-     ee = { 'standard_name':'sn%s', 'name':'n%s', 'units':'1' }
+     ee = { 'standard_name':'sn%s', 'long_name':'n%s', 'units':'1' }
      dir, tl, vgmap, fnpat = self.pcfg.mipVocabPars
      for f in tl:
@@ -686 +690 @@
           eeee = {}
           eeee['standard_name'] = ee['standard_name'] % i
-          eeee['name'] = ee['name'] % i
+          eeee['long_name'] = ee['long_name'] % i
+          eeee['cell_methods'] = 'time: point'
           eeee['units'] = ee['units']
           ar = []
@@ -781 +786 @@
 
     assert nn==n2, 'some file lost!!!!!!'
-    print '%s files, %s frequencies' % (nn,len(ee.keys()) )
+    self.info =  '%s files, %s frequencies' % (nn,len(ee.keys()) )
     self.ee = ee
 
@@ -847 +852 @@
 
   def __init__(self):
-    pass
+    self.fhCountMax = 0
 
   def get_open_fds(self):
@@ -864 +869 @@
             lambda s: s and s[ 0 ] == 'f' and s[1: ].isdigit(),
             self.procs.split( '\n' ) )
+    self.fhCountMax = max( self.fhCountMax, len(self.ps) )
     return len( self.ps )