Changeset 29116

Timestamp:

Sep 2, 2010, 5:16:00 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Tests fixes

Location:

branches/sc_branches/psps_testing

Files:

• build.sh (modified) (2 diffs)
• testers/batch_file.py (modified) (1 diff)
• testers/fits/p2.py (modified) (1 diff)
• testers/fits_file.py (modified) (2 diffs)

branches/sc_branches/psps_testing/build.sh

@@ -15 +15 @@
   utilities/__init__.py \
   utilities/configuration.py \
-  utilities/file_manipulation.py"
+  utilities/file_manipulation.py\
+  psi/psi_inquisitor.py"
 
 case "$1" in
@@ -30 +31 @@
         done
         echo "### Coverage results ###"
-        $COVERAGE -r -o /usr -m
+        $COVERAGE -r -o /usr,$HOME/local -m
         ;;
     all)

branches/sc_branches/psps_testing/testers/batch_file.py

@@ -30 +30 @@
     PSDC-940-006-01, 3.5.1 (file attributes/size): OK
     PSDC-940-006-01, 3.5.1 (file attributes/MD5 checksum of file): OK
+    BARF
     """
     def __init__(self, filename):

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

@@ -11 +11 @@
 
     def test(self):
-        return ("None", None)
+        return ("BARF", None)

branches/sc_branches/psps_testing/testers/fits_file.py

@@ -72 +72 @@
         >>> basename = 'B00029152'
         >>> tgz_filename = 'data/psut/ok/' + basename + '.tar.gz'
+
         >>> # Create the temporary directory for tests
         >>> FitsFileTester._setup_test_environment(basename, tgz_filename)
         >>> fft = FitsFileTester(fitsname, basename, '.tmp', 'P2')
+        >>> print fft.test()
+        ('BARF', None)
+        >>> # Delete temporary directory
+        >>> FitsFileTester._remove_test_environment()
+
+        >>> FitsFileTester._setup_test_environment(basename, tgz_filename)
+        >>> fft = FitsFileTester(fitsname, basename, '.tmp', 'Unsupported')
         >>> fft.test()
-        >>> # Delete temporary directory
+        Traceback (most recent call last):
+        ...
+        Exception: Unsupported FITS type [Unsupported]
         >>> FitsFileTester._remove_test_environment()
         """
@@ -82 +92 @@
             return P2FitsTester(self.fitsFile).test()
         else:
-            raise Exception("Unsupported FITS type [%s]" % fitsType)
+            raise Exception("Unsupported FITS type [%s]" % self.fitsType)
+
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()