Changeset 29438 for branches/sc_branches/psps_testing/testers/fits/p2.py

Timestamp:

Oct 15, 2010, 2:51:13 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Test report now in xml

File:

• branches/sc_branches/psps_testing/testers/fits/p2.py (modified) (5 diffs)

branches/sc_branches/psps_testing/testers/fits/p2.py

@@ -49 +49 @@
         True
         """
-        PsPsLogger.info('Testing P2FitsTester object')
-        # 1. There is no image for the PrimaryHDU (at 0)
-        PsPsLogger.debug('  Testing P2FitsTester object: primary')
-        product = self.test_primary()
-        if not product.success:
-            return product
-        # 2. Look at the FrameMeta information
-        PsPsLogger.debug('  Testing P2FitsTester object: frameMeta')
-        product = self.test_frame_meta(be_tolerant_for_types)
-        # Fail if there is any failure and we are type-strict
-        if not product.success and not be_tolerant_for_types:
-            return product
-        # 3. There should be 'product.nOTA' sequences of [ImageMeta,
-        # Detection, SkinnyObject, ObjectCalColor] frames
-        frameID = product.frameID
-        nOTA = product.nOTA
-        if len(self.fits) != 4*nOTA + 2:
-            TestReport.ko('Invalid number of OTA: from FITS file: %d / from FrameMeta %d'
-                          % (len(self.fits)-2/4, nOTA), 
+        try:
+            PsPsLogger.info('Testing P2FitsTester object')
+            # 1. There is no image for the PrimaryHDU (at 0)
+            PsPsLogger.debug('  Testing P2FitsTester object: primary')
+            product = self.test_primary()
+            if not product.success:
+                return product
+            # 2. Look at the FrameMeta information
+            PsPsLogger.debug('  Testing P2FitsTester object: frameMeta')
+            product = self.test_frame_meta(be_tolerant_for_types)
+            # Fail if there is any failure and we are type-strict
+            if not product.success and not be_tolerant_for_types:
+                return product
+            # 3. There should be 'product.nOTA' sequences of [ImageMeta,
+            # Detection, SkinnyObject, ObjectCalColor] frames
+            frameID = product.frameID
+            nOTA = product.nOTA
+            if len(self.fits) != 4*nOTA + 2:
+                TestReport.ko('Invalid number of OTA: from FITS file: %d / from FrameMeta %d'
+                              % (len(self.fits)-2/4, nOTA), 
+                              {'requirement': 'TBD'})
+                return TestProduct()
+            for ota_index in range(nOTA):
+                PsPsLogger.debug('  Testing P2FitsTester object: OTA (%d/%d)'
+                                 % ((ota_index+1), nOTA))
+                subproduct = self.test_detections_frames(frameID, ota_index, 
+                                                         be_tolerant_for_types)
+                if subproduct.success:
+                    TestReport.ok(requirement)
+                product.success = product.success and subproduct.success
+            return product
+        except KeyError, e:
+            PsPsLogger.error('  Exception caught!')
+            TestReport.ko('Unexpected exception',
                           {'requirement': 'TBD'})
+            TestReport.info(e)
             return TestProduct()
-        for ota_index in range(nOTA):
-            PsPsLogger.debug('  Testing P2FitsTester object: OTA (%d/%d)'
-                               % ((ota_index+1), nOTA))
-            subproduct = self.test_detections_frames(frameID, ota_index, 
-                                                     be_tolerant_for_types)
-            if subproduct.success:
-                TestReport.ok(requirement)
-            product.success = product.success and subproduct.success
-        return product
+            
 
     #####################################################
@@ -91 +99 @@
         fits_index = 4*ota_index+2
         product = TestProduct()
-        TestReport.title('Data frames tests')
+        TestReport.addSection('Data frames tests')
         if self.fits[fits_index].name != 'IMAGEMETA':
             TestReport.ko(requirement,
@@ -115 +123 @@
         query = 'SELECT * FROM ImageMeta WHERE imageID = %s' % str(imageID)
         answer = self.psi_inquisitor.query(query)
-        TestReport.title('ImageMeta values tests (frame %d - %s)'
-                         % (ota_index, query))
+        TestReport.addSection('ImageMeta values tests (frame %d - %s)'
+                              % (ota_index, query))
         subproduct = match(self.fits[fits_index].data, answer, requirement,
                            tolerance = Configuration.TOLERANCE,
@@ -158 +166 @@
         """
         Tests the contents of the FrameMeta table. 
-        - 48 columns x 1 row
-        - This table contains values that are useful, namely: frameID,
-          nOTA (number of OTA).
-        - The data can be found in PSI using the query:
+          - 48 columns x 1 row
+          - This table contains values that are useful, namely: frameID,
+            nOTA (number of OTA).
+          - The data can be found in PSI using the query:
                    SELECT * FROM FrameMeta WHERE frameID = <frameID>;
         """
         requirement = 'PSDC-940-006-01, 3.6.6.8: '
         product = TestProduct()
-        TestReport.title('MetaFrame tests')
+        TestReport.addSection('MetaFrame tests')
         if self.fits[1].header['NAXIS'] != 2:
             TestReport.ko(requirement, 'NAXIS != 2')
@@ -196 +204 @@
         Check that the primary header i.e. fits[0] has no dimension.
         """
-        TestReport.title('Primary frame tests')
+        TestReport.addSection('Primary frame tests')
         requirement = 'PSDC-940-006-01, 3.6.3, 1'
         product = TestProduct()