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

Timestamp:

Sep 23, 2010, 3:46:01 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Fixed unit tests

File:

• branches/sc_branches/psps_testing/testers/fits/p2.py (modified) (1 diff)

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

@@ -66 +66 @@
         nOTA = product.nOTA
         if len(self.fits) != 4*nOTA + 2:
-            report.write('\nInvalid number of OTA: from FITS file: %d / from FrameMeta %d'
-                         % (len(self.fits)-2/4, nOTA))
-            return (report.getvalue(), None)
+            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))
-            (messages, values) = self.test_detections_frames(frameID, ota_index, 
-                                                             be_tolerant_for_types) 
-            PsPsLogger.debug(messages)
-            report.write('\n' + messages)
-        return (report.getvalue(), None)
+            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
 
     #####################################################