Merge lp:~kenseehart/phatch/PGM_bugfix_472978_test into lp:phatch

[Ken Seehart]

[Ken Seehart (kenseehart)]

Added verification that the file extension is appropriate for the format of the file content, on all output files.

[lp:~kenseehart/phatch/PGM_bugfix_472978_test]

1557. By Ken Seehart <ken@ken-laptop> on 2010-02-23

pep8

[Nadia Alramli (nadiana)]

Looks good to me, handing this to Stani to do the merge.

[Stani (stani)]

It is a good addition to the test suite, so thanks a lot!

I have only the following request:
verify_image_type should move to phatch/lib/imtools

Please push your branch when done and I'll merge it.

review: Needs Fixing

[Stani (stani)]

Also please fix these PEP8 issues:

PGM_bugfix_472978_test/tests$ ./run_pep8_test.py
../tests/run_acceptance_test.py:252:1: W291 trailing whitespace

^
1
../tests/test_suite/utils.py:93:24: E261 at least two spaces before inline comment
        'pgm': ['ppm'], # PIL bug: PIL saves greyscale PPM as PGM
                       ^
../tests/test_suite/utils.py:110:11: E225 missing whitespace around operator
    if ext!=t and ext not in altext.get(t, []):
          ^
2

=== modified file 'tests/run_acceptance_test'
--- tests/run_acceptance_test	2010-02-23 15:14:31 +0000
+++ tests/run_acceptance_test	2010-02-23 18:37:21 +0000
@@ -134,6 +134,7 @@
         default='',
         help='Command line options to pass to phatch'
     )
+
     options, args = parser.parse_args()
     if not options.no_execute and not os.path.exists(options.input):
         logging.error(
@@ -235,6 +236,14 @@
             report.info('Errors:\n\t%s' % '\n\t'.join(errors))
         else:
             logging.info('No errors')
+
+    for image in os.listdir(options.output):
+        path1 = os.path.join(options.output, image)
+        if os.path.exists(path1):
+            ok, reason = utils.verify_image_type(path1)
+            if not ok:
+                report.info('Format/Ext Mismatch: %s' % reason)
+    
     if options.compare:
         utils.create_path(config.OUT_DIFF)
         new = []

=== modified file 'tests/test_suite/utils.py'
--- tests/test_suite/utils.py	2010-02-23 15:20:48 +0000
+++ tests/test_suite/utils.py	2010-02-23 18:37:21 +0000
@@ -23,6 +23,8 @@
 import filecmp
 import os
 import shutil
+import imghdr
+import Image
 
 
 def system_path(path):
@@ -79,6 +81,39 @@
     return name
 
 
+def verify_image_type(name):
+    """Check that file extension matches the content
+    if successful: ok = True, reason = None
+    else: ok = False, reason = string describing error
+    """
+    altext = {
+        'jpeg': ['jpg', 'jpe'],
+        'tiff': ['tif'],
+        'eps': ['ps'],
+        'pgm': ['ppm'], # PIL bug: PIL saves greyscale PPM as PGM
+        'pbm': ['ppm'], # PIL bug: PIL saves black and white PPM as PBM
+        }
+
+    # first use opinion of imghdr (python standard library)
+    t = imghdr.what(name)
+    ext = os.path.splitext(name)[1][1:]
+
+    if t is None:
+        # Get PILs opinion
+        # Known types support by PIL but not imghdr: im, pcx, jpeg(CMYK)
+        try:
+            im = Image.open(name)
+            t = im.format.lower()
+        except IOError:
+            return False, 'Content type not recognized in %s' % name
+
+    if ext!=t and ext not in altext.get(t, []):
+        return (False,
+                'Content type %s does not match extension in %s' % (t, name))
+    else:
+        return True, None
+
+
 def compare(file1, file2):
     """Compare two files"""
     return filecmp.cmp(file1, file2)