Changeset 392 for CMIP6dreqbuild/trunk/src

Timestamp:

25/09/15 17:46:09 (7 years ago)

Author:

mjuckes

Message:

simpleCheck updated

Location:

CMIP6dreqbuild/trunk/src/framework

Files:

• ptxt.py (modified) (1 diff)
• simpleCheck.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/src/framework/ptxt.py

@@ -128 +128 @@
            value = "noType"
            if i.type == "xs:string":
-             if i.name == 'uuid':
+             if i.name == 'uid':
                value = str( uuid.uuid1() )
              else:

CMIP6dreqbuild/trunk/src/framework/simpleCheck.py

@@ -68 +68 @@
   def _ch02_importSample(self):
     import dreq
-    rq = dreq.loadDreq( dreqXML='out/dreqSample.xml',configdoc='out/dreqDefn.xml' )
+    rq = dreq.loadDreq( dreqXML='out/dreq2Sample.xml',configdoc='out/dreq2Defn.xml' )
     print 'Dreq sample load checked'
     self.ok = True
@@ -95 +95 @@
       self._clear_ch03()
       return
-    schema = 'out/dreqSchema.xsd'
-    xml = 'out/dreqSample.xml'
+    schema = 'out/dreq2Schema.xsd'
+    xml = 'out/dreq2Sample.xml'
 
     cmd = 'xmllint --noout --schema %s %s  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % (schema,xml) 
@@ -110 +110 @@
       print 'Sample XML validated'
       self.ok = True
+      self._clear_ch03()
     else:
       print 'Sample XML failed to validate'
+      print cmd
       self.ok = False
-    self._clear_ch03()
     return