From 9cba1e475a067ae3698a25fcaeebe74486a6e8a8 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Mon, 19 Apr 2021 13:07:07 +0100 Subject: [PATCH] Stop the test from failing when EXIV2_ENABLE_BMFF=Off. --- tests/bugfixes/github/test_issue_1570.py | 29 +++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/tests/bugfixes/github/test_issue_1570.py b/tests/bugfixes/github/test_issue_1570.py index 6446d7ec..9d18c978 100644 --- a/tests/bugfixes/github/test_issue_1570.py +++ b/tests/bugfixes/github/test_issue_1570.py @@ -1,20 +1,33 @@ # -*- coding: utf-8 -*- -from system_tests import CaseMeta, path +import system_tests +import unittest +# test needs system_tests.BT.vv['enable_bmff']=1 +bSkip=system_tests.BT.verbose_version().get('enable_bmff')!='1' +if bSkip: + raise unittest.SkipTest('*** requires enable_bmff=1 ***') -class BmffImageReadMetadataOutOfBoundsRead(metaclass=CaseMeta): +class BmffImageReadMetadataOutOfBoundsRead(metaclass=system_tests.CaseMeta): """ Regression test for the bug described in: https://github.com/Exiv2/exiv2/issues/1570 """ url = "https://github.com/Exiv2/exiv2/issues/1570" + filename = "$data_path/issue_1570_poc.bmff" - filename = path("$data_path/issue_1570_poc.bmff") - commands = ["$exiv2 $filename"] - stdout = [""] - stderr = [ -"""Exiv2 exception in print action for file $filename: + if bSkip: + commands=[] + retval=[] + stdin=[] + stderr=[] + stdout=[] + print("*** test skipped. requires enable_bmff=1***") + else: + commands = ["$exiv2 $filename"] + stdout = [""] + stderr = [ + """Exiv2 exception in print action for file $filename: $kerCorruptedMetadata """] - retval = [1] + retval = [1]