Merge ~rodrigo-zaiden/qa-regression-testing:update-test-libpng into qa-regression-testing:master

[Rodrigo Figueiredo Zaiden]

[Marc Deslauriers (mdeslaur)]

LGTM!

review: Approve

diff --git a/scripts/test-libpng.py b/scripts/test-libpng.py
index c6983ce..02424fb 100755
--- a/scripts/test-libpng.py
+++ b/scripts/test-libpng.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python2
 #
 #    test-libpng.py quality assurance test script for Xine
-#    Copyright (C) 2009-2015 Canonical Ltd.
+#    Copyright (C) 2009-2022 Canonical Ltd.
 #    Author: Jamie Strandboge <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -25,8 +25,8 @@
 
   NOTES:
     When run with '--download', this file will download various files
-    from ftp://ftp.simplesystems.org/pub/libpng/png/images/suite/ if they don't
-    already exist. These files should not be added to the bzr branch for
+    from http://www.schaik.com/pngsuite/ if they don't
+    already exist. These files should not be added to the branch for
     qa-regression-testing due to copyright.
 
     When running, the script will launch the executable, and you will have to
@@ -46,8 +46,8 @@ import testlib
 import testlib_multimedia
 
 topdir = os.path.join(os.getcwd(), "testlib_png")
-topurl = "ftp://ftp.simplesystems.org/pub/libpng/png/images/suite/"
-archive = "PngSuite.tar.gz"
+topurl = "http://www.schaik.com/pngsuite/"
+archive = "PngSuite-2017jul19.tgz"
 
 use_x = False
 use_private = True
@@ -107,9 +107,9 @@ class TestPNG(testlib_multimedia.MultimediaCommon):
             add_file_url = False
             if exe == "eog":
                 add_file_url = True
-            elif exe == "pnginfo": # These fail for some reason
-                files.remove("ct1n0g04.png")
-                files.remove("ctzn0g04.png")
+            elif exe == "pnginfo": # These used to fail for some reason (leaving for reference)
+                #files.remove("ct1n0g04.png")
+                #files.remove("ctzn0g04.png")
 
                 arch = testlib.get_arch()
                 if arch == "x86_64" and self.lsb_release['Release'] == 14.04:
@@ -136,28 +136,27 @@ class TestPNG(testlib_multimedia.MultimediaCommon):
                 count += 1
                 expected = 0
                 search = ""
-                if bad == "x00n0g01.png":
-                    if exe == "pnginfo":
-                        expected = 42
-                        search = "Could not set PNG jump value"
-                    elif exe == "pngchunks": # segfaults normally
-                        continue
-                elif (bad == "xcrn0g04.png" or bad == "xlfn0g04.png") and exe == "pngchunks":
-                    expected = 1
+
                 rc, report = testlib.cmd([exe, f])
+                if exe == "pnginfo":
+                    search = "Could not set PNG jump value"
+                    if search in report:
+                        expected = 42
+                elif exe == "pngchunks":
+                    search = "This is not a PNG file"
+                    if search in report:
+                        expected = 1
                 result = 'Got exit code %d, expected %d for \'%s %s\'\n' % (rc, expected, exe, f)
                 self.assertEqual(expected, rc, result + report)
-                if search != "":
-                    self.assertTrue(search in report, "Could not find '%s' in:\n%s" % (search, report))
 
     def test_pngcrush(self):
         '''Test pngcrush'''
         files = []
         for f in self.files:
             files.append(f)
-        # These fail for some reason
-        files.remove("ct1n0g04.png")
-        files.remove("ctzn0g04.png")
+        # These used to fail for some reason (leaving for reference)
+        #files.remove("ct1n0g04.png")
+        #files.remove("ctzn0g04.png")
 
         count = 1
         for fn in files:
@@ -166,7 +165,7 @@ class TestPNG(testlib_multimedia.MultimediaCommon):
             print("(%d of %d: Trying %s with pngcrush)" % (count, len(files), fn))
             count += 1
 
-            rc, report = testlib.cmd(['pngcrush', '-d', '/tmp', '-v', '-n', f])
+            rc, report = testlib.cmd(['pngcrush', '-d', '/tmp', '-v', '-v', '-n', f])
             expected = 0
             result = 'Got exit code %d, expected %d for \'%s\'\n' % (rc, expected, f)
             self.assertEqual(expected, rc, result + report)