[testsuite] Addapt tests to new test suite structure

2018-04-21 00:56:12 +02:00 · 2018-04-21 00:56:12 +02:00 · 11cd1eabf8
commit 11cd1eabf8
parent c40c90141f
42 changed files with 202 additions and 200 deletions
--- a/tests/bugfixes/github/test_CVE_2017_1000126.py
+++ b/tests/bugfixes/github/test_CVE_2017_1000126.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/175"

-    filename = "{data_path}/cve_2017_1000126_stack-oob-read.webp"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/cve_2017_1000126_stack-oob-read.webp"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_1000127.py
+++ b/tests/bugfixes/github/test_CVE_2017_1000127.py
@ -3,14 +3,14 @@
 import system_tests


-class TestPoC(system_tests.Case):
+class TestPoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/176"

-    filename = "{data_path}/heap-oob-write.tiff"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/heap-oob-write.tiff"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11336.py
+++ b/tests/bugfixes/github/test_CVE_2017_11336.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/49"

-    filename = "{data_path}/POC2"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC2"
+    commands = ["$exiv2 " + filename]
    retval = [1]
    stdout = [""]
    stderr = [
-        """{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+        """$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
--- a/tests/bugfixes/github/test_CVE_2017_11337.py
+++ b/tests/bugfixes/github/test_CVE_2017_11337.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/50"

-    filename = "{data_path}/POC3"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC3"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11338.py
+++ b/tests/bugfixes/github/test_CVE_2017_11338.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/51"

-    filename = "{data_path}/POC4"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC4"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11339.py
+++ b/tests/bugfixes/github/test_CVE_2017_11339.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/52"

-    filename = "{data_path}/POC5"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC5"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11340.py
+++ b/tests/bugfixes/github/test_CVE_2017_11340.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/53"

-    filename = "{data_path}/POC6"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC6"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11553.py
+++ b/tests/bugfixes/github/test_CVE_2017_11553.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/54"

-    filename = "{data_path}/POC7"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC7"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11591.py
+++ b/tests/bugfixes/github/test_CVE_2017_11591.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/55"

-    filename = "{data_path}/POC8"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC8"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11592.py
+++ b/tests/bugfixes/github/test_CVE_2017_11592.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/56"

-    filename = "{data_path}/POC9"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC9"
+    commands = ["$exiv2 " + filename]
    stdout = [""""""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_11683.py
+++ b/tests/bugfixes/github/test_CVE_2017_11683.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/57"

-    filename = "{data_path}/POC"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{kerInvalidTypeValue}:  0
-{exiv2_exception_message} """ + filename + """:
-{kerInvalidTypeValue}
+    stderr = ["""$kerInvalidTypeValue:  0
+$exiv2_exception_message """ + filename + """:
+$kerInvalidTypeValue
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_12955.py
+++ b/tests/bugfixes/github/test_CVE_2017_12955.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/58"

-    filename = "{data_path}/POC11"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC11"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_12956.py
+++ b/tests/bugfixes/github/test_CVE_2017_12956.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/59"

-    filename = "{data_path}/POC12"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC12"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_12957.py
+++ b/tests/bugfixes/github/test_CVE_2017_12957.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/60"

-    filename = "{data_path}/POC13"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC13"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14857.py
+++ b/tests/bugfixes/github/test_CVE_2017_14857.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/76"

-    filename = "{data_path}/010_bad_free"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/010_bad_free"
+    commands = ["$exiv2 " + filename]
    retval = [1]
    stdout = [""]
    stderr = [
-        """{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+        """$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
--- a/tests/bugfixes/github/test_CVE_2017_14858.py
+++ b/tests/bugfixes/github/test_CVE_2017_14858.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/138"

-    filename = "{data_path}/007-heap-buffer-over"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/007-heap-buffer-over"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14859.py
+++ b/tests/bugfixes/github/test_CVE_2017_14859.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/74"

-    filename = "{data_path}/005-invalid-mem"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/005-invalid-mem"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]

--- a/tests/bugfixes/github/test_CVE_2017_14860.py
+++ b/tests/bugfixes/github/test_CVE_2017_14860.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/73"

-    filename = "{data_path}/003-heap-buffer-over"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/003-heap-buffer-over"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14861.py
+++ b/tests/bugfixes/github/test_CVE_2017_14861.py
@ -3,17 +3,17 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = [
        "https://github.com/Exiv2/exiv2/issues/139",
        "https://bugzilla.redhat.com/show_bug.cgi?id=1494787"
    ]

-    filename = "{data_path}/009-stack-over"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/009-stack-over"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14862.py
+++ b/tests/bugfixes/github/test_CVE_2017_14862.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/75"

-    filename = "{data_path}/008-invalid-mem"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/008-invalid-mem"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]

--- a/tests/bugfixes/github/test_CVE_2017_14863.py
+++ b/tests/bugfixes/github/test_CVE_2017_14863.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/132"

-    filename = "{data_path}/01-Null-exiv2-poc"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/01-Null-exiv2-poc"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14864.py
+++ b/tests/bugfixes/github/test_CVE_2017_14864.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/73"

-    filename = "{data_path}/02-Invalid-mem-def"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/02-Invalid-mem-def"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14865.py
+++ b/tests/bugfixes/github/test_CVE_2017_14865.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/134"

-    filename = "{data_path}/004-heap-buffer-over"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/004-heap-buffer-over"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{kerInvalidTypeValue}:  250
-{exiv2_exception_message} """ + filename + """:
-{kerInvalidTypeValue}
+    stderr = ["""$kerInvalidTypeValue:  250
+$exiv2_exception_message """ + filename + """:
+$kerInvalidTypeValue
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_14866.py
+++ b/tests/bugfixes/github/test_CVE_2017_14866.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/140"

-    filename = "{data_path}/006-heap-buffer-over"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/006-heap-buffer-over"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_17669.py
+++ b/tests/bugfixes/github/test_CVE_2017_17669.py
@ -3,16 +3,16 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/187"

-    filename = "{data_path}/issue_187"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/issue_187"
+    commands = ["$exiv2 " + filename]
    retval = [1]
    stdout = [""]
    stderr = [
-	"""{exiv2_exception_message} """ + filename + """:
-{kerFailedToReadImageData}
+	"""$exiv2_exception_message """ + filename + """:
+$kerFailedToReadImageData
 """
    ]
--- a/tests/bugfixes/github/test_CVE_2017_17722.py
+++ b/tests/bugfixes/github/test_CVE_2017_17722.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/208"

-    filename = "{data_path}/2018-01-09-exiv2-crash-001.tiff"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/2018-01-09-exiv2-crash-001.tiff"
+    commands = ["$exiv2 " + filename]
    retval = [1]
    stdout = [""]
    stderr = [
-        """{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+        """$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
--- a/tests/bugfixes/github/test_CVE_2017_17725.py
+++ b/tests/bugfixes/github/test_CVE_2017_17725.py
@ -3,15 +3,15 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/188"
    found_by = ["Wei You", "@youwei1988"]

-    filename = "{data_path}/poc_2017-12-12_issue188"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/poc_2017-12-12_issue188"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_overflow_exception_message} """ + filename + """:
-{addition_overflow_message}
+    stderr = ["""$exiv2_overflow_exception_message """ + filename + """:
+$addition_overflow_message
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2017_18005.py
+++ b/tests/bugfixes/github/test_CVE_2017_18005.py
@ -3,7 +3,7 @@
 import system_tests


-class TestPoC(system_tests.Case):
+class TestPoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/168"

@ -12,20 +12,20 @@ Error: Offset of directory Image, entry 0x0117 is out of bounds: Offset = 0x3030
 """ + 12 * """Error: Offset of directory Image, entry 0x3030 is out of bounds: Offset = 0x30303030; truncating the entry
 """

-    filename = "{data_path}/cve_2017_18005_reproducer.tiff"
+    filename = "$data_path/cve_2017_18005_reproducer.tiff"

    commands = [
-        "{exiv2} -v pr -P EIXxgklnycsvth " + filename,
-        "{exiv2json} " + filename
+        "$exiv2 -v pr -P EIXxgklnycsvth " + filename,
+        "$exiv2json " + filename
    ]

    stdout = ["""File 1/1: """ + filename + """
 0x0117 Image        Exif.Image.StripByteCounts                   StripByteCounts             Strip Byte Count               SByte       0   0  

 """,
-    """{{
-	"Exif": {{
-		"Image": {{
+    """{
+	"Exif": {
+		"Image": {
 			"StripByteCounts": 0,
 			"0x3030": 0,
 			"0x3030": "",
@ -40,9 +40,9 @@ Error: Offset of directory Image, entry 0x0117 is out of bounds: Offset = 0x3030
 			"0x3030": 0,
 			"0x3030": 0,
 			"0x3030": 0
-		}}
-	}}
-}}
+		}
+	}
+}
 """
    ]
    stderr = [
--- a/tests/bugfixes/github/test_CVE_2017_9953.py
+++ b/tests/bugfixes/github/test_CVE_2017_9953.py
@ -3,14 +3,14 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/144"

-    filename = "{data_path}/POC1"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/POC1"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerInvalidMalloc}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerInvalidMalloc
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_CVE_2018_4868.py
+++ b/tests/bugfixes/github/test_CVE_2018_4868.py
@ -3,16 +3,16 @@
 import system_tests


-class TestCvePoC(system_tests.Case):
+class TestCvePoC(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/202"
    cve_url = "http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-4868"
    found_by = ["afl", "topsecLab", "xcainiao"]

-    filename = "{data_path}/exiv2-memorymmap-error"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/exiv2-memorymmap-error"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_issue_159.py
+++ b/tests/bugfixes/github/test_issue_159.py
@ -3,18 +3,18 @@
 import system_tests


-class TestFirstPoC(system_tests.Case):
+class TestFirstPoC(metaclass=system_tests.CaseMeta):
    """
    Regression test for the first bug described in:
    https://github.com/Exiv2/exiv2/issues/159
    """
    url = "https://github.com/Exiv2/exiv2/issues/159"

-    filename = "{data_path}/printStructure"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/printStructure"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerCorruptedMetadata}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
 """]
    retval = [1]

--- a/tests/bugfixes/github/test_issue_170.py
+++ b/tests/bugfixes/github/test_issue_170.py
@ -3,15 +3,15 @@
 import system_tests


-class DecodeIHDRChunkOutOfBoundsRead(system_tests.Case):
+class DecodeIHDRChunkOutOfBoundsRead(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/170"

-    filename = "{data_path}/issue_170_poc"
+    filename = "$data_path/issue_170_poc"

-    commands = ["{exiv2} " + filename]
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerFailedToReadImageData}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerFailedToReadImageData
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_issue_20.py
+++ b/tests/bugfixes/github/test_issue_20.py
@ -3,7 +3,7 @@
 import system_tests


-class TamronSupport(system_tests.Case):
+class TamronSupport(metaclass=system_tests.CaseMeta):

    description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'"

@ -14,9 +14,9 @@ class TamronSupport(system_tests.Case):
        "TamronSP90mmF2.8DiVCUSDMacroF004.exv",
        "TamronSP90mmF2.8DiVCUSDMacroF017.exv"
    ]
-    commands = ["{exiv2} -pa --grep lens/i ../../../test/data/" + files[0]] \
+    commands = ["$exiv2 -pa --grep lens/i ../../../test/data/" + files[0]] \
        + list(map(
-            lambda fname: "{exiv2} -pa --grep lenstype/i ../../../test/data/" + fname,
+            lambda fname: "$exiv2 -pa --grep lenstype/i ../../../test/data/" + fname,
            files[1:]
        ))
    retval = [0] * len(files)
--- a/tests/bugfixes/github/test_issue_227.py
+++ b/tests/bugfixes/github/test_issue_227.py
@ -3,7 +3,7 @@
 import system_tests


-class SigmaLenses(system_tests.Case):
+class SigmaLenses(metaclass=system_tests.CaseMeta):

    files = [
        "Sigma_120-300_DG_OS_HSM_Sport_lens.exv",
@ -12,7 +12,7 @@ class SigmaLenses(system_tests.Case):
    ]

    commands = list(
-        map(lambda fname: "{exiv2} -pa --grep lens/i {data_path}/" + fname, files)
+        map(lambda fname: "$exiv2 -pa --grep lens/i $data_path/" + fname, files)
    )

    retval = 3 * [0]
--- a/tests/bugfixes/github/test_issue_246.py
+++ b/tests/bugfixes/github/test_issue_246.py
@ -2,15 +2,16 @@

 import system_tests

-class TestFirstPoC(system_tests.Case):
+
+class TestFirstPoC(metaclass=system_tests.CaseMeta):
    """
    Regression test for the first bug described in:
    https://github.com/Exiv2/exiv2/issues/246
    """
    url = "https://github.com/Exiv2/exiv2/issues/246"

-    filename = "{data_path}/1-string-format.jpg"
-    commands = ["{exiv2} -pS " + filename]
+    filename = "$data_path/1-string-format.jpg"
+    commands = ["$exiv2 -pS " + filename]
    stdout = [
        """STRUCTURE OF JPEG FILE: """ + filename + """
 address | marker       |  length | data
@ -19,7 +20,7 @@ class TestFirstPoC(system_tests.Case):
 """]


-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerNoImageInInputData}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerNoImageInInputData
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_issue_247.py
+++ b/tests/bugfixes/github/test_issue_247.py
@ -2,15 +2,15 @@

 import system_tests

-class TestFirstPoC(system_tests.Case):
+class TestFirstPoC(metaclass=system_tests.CaseMeta):
    """
    Regression test for the first bug described in:
    https://github.com/Exiv2/exiv2/issues/247
    """
    url = "https://github.com/Exiv2/exiv2/issues/247"

-    filename = "{data_path}/2-invalid-memory-access"
-    commands = ["{exiv2} -pt " + filename]
+    filename = "$data_path/2-invalid-memory-access"
+    commands = ["$exiv2 -pt " + filename]
    stdout = [
        """Exif.Image.Make                              Ascii       6  Canon
 Exif.Image.Orientation                       Short       1  top, left
--- a/tests/bugfixes/github/test_issue_253.py
+++ b/tests/bugfixes/github/test_issue_253.py
@ -2,17 +2,18 @@

 import system_tests

-class TestFirstPoC(system_tests.Case):
+
+class TestFirstPoC(metaclass=system_tests.CaseMeta):
    """
    Regression test for the first bug described in:
    https://github.com/Exiv2/exiv2/issues/253
    """
    url = "https://github.com/Exiv2/exiv2/issues/253"

-    filename = "{data_path}/3-stringformat-outofbound-read"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/3-stringformat-outofbound-read"
+    commands = ["$exiv2 " + filename]
    stdout = [""]
-    stderr = ["""{exiv2_exception_message} """ + filename + """:
-{kerNotAJpeg}
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerNotAJpeg
 """]
    retval = [1]
--- a/tests/bugfixes/github/test_issue_45.py
+++ b/tests/bugfixes/github/test_issue_45.py
@ -3,12 +3,12 @@
 import system_tests


-class Sigma24_105mmRecognization(system_tests.Case):
+class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta):

    url = "https://github.com/Exiv2/exiv2/issues/45"

-    filename = "{data_path}/exiv2-g45.exv"
-    commands = ["{exiv2} -pa --grep lens/i " + filename]
+    filename = "$data_path/exiv2-g45.exv"
+    commands = ["$exiv2 -pa --grep lens/i " + filename]
    stdout = ["""Exif.CanonCs.LensType                        Short       1  Sigma 24-105mm F4 DG OS HSM [Art 013]
 Exif.CanonCs.Lens                            Short       3  24.0 - 105.0 mm
 Exif.CanonCf.LensAFStopButton                Short       1  0
--- a/tests/bugfixes/github/test_regression_issue_201.py
+++ b/tests/bugfixes/github/test_regression_issue_201.py
@ -3,9 +3,9 @@
 import system_tests


-class ShadowingError(system_tests.Case):
+class ShadowingError(metaclass=system_tests.CaseMeta):

-    commands = ["{exiv2} -PE {data_path}/IMGP0020.exv"]
+    commands = ["$exiv2 -PE $data_path/IMGP0020.exv"]
    stdout = [""]
    stderr = [""]
    retval = [0]
--- a/tests/bugfixes/redmine/test_1305.py
+++ b/tests/bugfixes/redmine/test_1305.py
@ -3,7 +3,7 @@
 import system_tests


-class Issue1305Test(system_tests.Case):
+class Issue1305Test(metaclass=system_tests.CaseMeta):
    err_msg_dir_img = """Warning: Directory Image, entry 0x3030 has unknown Exif (TIFF) type 12336; setting type size 1.
 Error: Directory Image, entry 0x3030 has invalid size 808464432*1; skipping entry.
 """
@ -19,8 +19,8 @@ Error: Directory Pentax, entry 0x3030 has invalid size 808464432*1; skipping ent
    name = "regression test for issue 1305"
    url = "http://dev.exiv2.org/issues/1305"

-    filename = "{data_path}/IMGP0006-min.jpg"
-    commands = ["{exiv2} " + filename]
+    filename = "$data_path/IMGP0006-min.jpg"
+    commands = ["$exiv2 " + filename]
    stdout = ["""File name       : """ + filename + """
 File size       : 12341 Bytes
 MIME type       : image/jpeg
--- a/tests/tiff_test/test_tag_compare.py
+++ b/tests/tiff_test/test_tag_compare.py
@ -3,7 +3,7 @@
 import system_tests


-class OutputTagExtract(system_tests.Case):
+class OutputTagExtract(metaclass=system_tests.CaseMeta):
    """
    Test whether exiv2 -pa $file and exiv2 -pS $file produces the same output.
    """
@ -107,7 +107,7 @@ class OutputTagExtract(system_tests.Case):
            self.compare_pS_pa()

    commands = [
-        "{exiv2} %s {data_path}/mini9.tif" % (opt) for opt in ["-pa", "-pS"]
+        "$exiv2 %s $data_path/mini9.tif" % (opt) for opt in ["-pa", "-pS"]
    ]

    stderr = [""] * 2
@ -131,7 +131,7 @@ Exif.Image.YResolution                       Rational    1  72
 Exif.Image.PlanarConfiguration               Short       1  1
 Exif.Image.ResolutionUnit                    Short       1  inch
 """,
-        """STRUCTURE OF TIFF FILE (II): {data_path}/mini9.tif
+        """STRUCTURE OF TIFF FILE (II): $data_path/mini9.tif
 address |    tag                              |      type |    count |    offset | value
     254 | 0x00fe NewSubfileType               |      LONG |        1 |           | 0
     266 | 0x0100 ImageWidth                   |     SHORT |        1 |           | 9
@ -150,5 +150,5 @@ Exif.Image.ResolutionUnit                    Short       1  inch
     422 | 0x011b YResolution                  |  RATIONAL |        1 |       518 | 1207959552/16777216
     434 | 0x011c PlanarConfiguration          |     SHORT |        1 |           | 1
     446 | 0x0128 ResolutionUnit               |     SHORT |        1 |           | 2
-END {data_path}/mini9.tif
+END $data_path/mini9.tif
 """]
--- a/tests/tiff_test/test_tiff_test_program.py
+++ b/tests/tiff_test/test_tiff_test_program.py
@ -3,10 +3,10 @@
 import system_tests


-@system_tests.CopyFiles("{data_path}/mini9.tif")
-class TestTiffTestProg(system_tests.Case):
+@system_tests.CopyFiles("$data_path/mini9.tif")
+class TestTiffTestProg(metaclass=system_tests.CaseMeta):

-    commands = ["{tiff-test} {data_path}/mini9_copy.tif"]
+    commands = ["$tiff_test $data_path/mini9_copy.tif"]

    stdout = [
        """Test 1: Writing empty Exif data without original binary data: ok.