Ignore:
Timestamp:
28/09/15 17:47:08 (4 years ago)
Author:
mjuckes
Message:

miscellaneous cleaning for 01.beta

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreq/trunk/src/simpleCheck.py

    r369 r394  
    6868  def _ch02_importSample(self): 
    6969    import dreq 
    70     rq = dreq.loadDreq( dreqXML='out/dreqSample.xml',configdoc='out/dreqDefn.xml' ) 
     70    rq = dreq.loadDreq( dreqXML='out/dreq2Sample.xml',configdoc='out/dreq2Defn.xml' ) 
    7171    print 'Dreq sample load checked' 
    7272    self.ok = True 
     
    9595      self._clear_ch03() 
    9696      return 
    97     schema = 'out/dreqSchema.xsd' 
    98     xml = 'out/dreqSample.xml' 
     97 
     98#schema location 
     99    schema = '../docs/dreq2Schema.xsd' 
     100#xml location 
     101    xml = '../docs/dreq2Sample.xml' 
    99102 
    100103    cmd = 'xmllint --noout --schema %s %s  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % (schema,xml)  
     
    110113      print 'Sample XML validated' 
    111114      self.ok = True 
     115      self._clear_ch03() 
    112116    else: 
    113117      print 'Sample XML failed to validate' 
     118      print cmd 
    114119      self.ok = False 
    115     self._clear_ch03() 
    116120    return 
    117121     
Note: See TracChangeset for help on using the changeset viewer.