Changeset 392


Ignore:
Timestamp:
25/09/15 17:46:09 (4 years ago)
Author:
mjuckes
Message:

simpleCheck updated

Location:
CMIP6dreqbuild/trunk/src/framework
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/ptxt.py

    r387 r392  
    128128           value = "noType" 
    129129           if i.type == "xs:string": 
    130              if i.name == 'uuid': 
     130             if i.name == 'uid': 
    131131               value = str( uuid.uuid1() ) 
    132132             else: 
  • CMIP6dreqbuild/trunk/src/framework/simpleCheck.py

    r370 r392  
    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    schema = 'out/dreq2Schema.xsd' 
     98    xml = 'out/dreq2Sample.xml' 
    9999 
    100100    cmd = 'xmllint --noout --schema %s %s  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % (schema,xml)  
     
    110110      print 'Sample XML validated' 
    111111      self.ok = True 
     112      self._clear_ch03() 
    112113    else: 
    113114      print 'Sample XML failed to validate' 
     115      print cmd 
    114116      self.ok = False 
    115     self._clear_ch03() 
    116117    return 
    117118     
Note: See TracChangeset for help on using the changeset viewer.