From 0c4c3a02135eb933d5f0ecd3e863ecef866044b4 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 07:05:04 +0000 Subject: [PATCH 01/11] use raise from test_pr1475*.py --- tests/bugfixes/github/test_pr1475_AVIF.py | 9 +++++---- tests/bugfixes/github/test_pr1475_HEIC.py | 9 +++++---- tests/bugfixes/github/test_pr1475_HIF.py | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/bugfixes/github/test_pr1475_AVIF.py b/tests/bugfixes/github/test_pr1475_AVIF.py index fe1dbdab..0f262eb2 100644 --- a/tests/bugfixes/github/test_pr1475_AVIF.py +++ b/tests/bugfixes/github/test_pr1475_AVIF.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import system_tests +import unittest -# test needs system_tests.BT.vv.enable_bmff=1 -enable_bmff = 'enable_bmff' -vv=system_tests.BT.verbose_version() -bSkip = not (enable_bmff in vv and vv[enable_bmff] == '1') +# 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 pr_1475_avif_avif(metaclass=system_tests.CaseMeta): url = "https://github.com/Exiv2/exiv2/pull/1475" diff --git a/tests/bugfixes/github/test_pr1475_HEIC.py b/tests/bugfixes/github/test_pr1475_HEIC.py index 6fc18345..7623b4da 100644 --- a/tests/bugfixes/github/test_pr1475_HEIC.py +++ b/tests/bugfixes/github/test_pr1475_HEIC.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import system_tests +import unittest -# test needs system_tests.BT.vv.enable_bmff=1 -vv=system_tests.BT.verbose_version() -enable_bmff = 'enable_bmff' -bSkip = not (enable_bmff in vv and vv[enable_bmff] == '1') +# 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 pr_1475_2021_heic(metaclass=system_tests.CaseMeta): url = "https://github.com/Exiv2/exiv2/pull/1475" diff --git a/tests/bugfixes/github/test_pr1475_HIF.py b/tests/bugfixes/github/test_pr1475_HIF.py index de510d5c..91825431 100644 --- a/tests/bugfixes/github/test_pr1475_HIF.py +++ b/tests/bugfixes/github/test_pr1475_HIF.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import system_tests +import unittest -# test needs system_tests.BT.vv.enable_bmff=1 -vv=system_tests.BT.verbose_version() -enable_bmff = 'enable_bmff' -bSkip = not (enable_bmff in vv and vv[enable_bmff] == '1') +# 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 pr_1475_Sony_hif(metaclass=system_tests.CaseMeta): url = "https://github.com/Exiv2/exiv2/pull/1475" From ccaa50909a1e27d96dc8714e943f198ae278f70f Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 07:09:45 +0000 Subject: [PATCH 02/11] Add unit_tests to suite.conf --- tests/suite.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/suite.conf b/tests/suite.conf index e5c48c21..2ca37435 100644 --- a/tests/suite.conf +++ b/tests/suite.conf @@ -24,6 +24,7 @@ valgrind: [paths] exiv2: ${ENV:exiv2_path}/exiv2 +unit_tests: ${ENV:exiv2_path}/unit_tests exiv2json: ${ENV:exiv2_path}/exiv2json data_path: ../test/data tmp_path: ../test/tmp From 5e82f260a14098305c995493914bd1a5d1d56e18 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 07:11:55 +0000 Subject: [PATCH 03/11] Add python scripts equivalent to test/version_test.sh and unit_test.sh --- tests/bash_tests/unit_test.py | 13 +++++++++++++ tests/bash_tests/version_test.py | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 tests/bash_tests/unit_test.py create mode 100644 tests/bash_tests/version_test.py diff --git a/tests/bash_tests/unit_test.py b/tests/bash_tests/unit_test.py new file mode 100644 index 00000000..173b74f2 --- /dev/null +++ b/tests/bash_tests/unit_test.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +import system_tests +import os +import unittest + +bSkip=not os.path.isfile(system_tests.unit_tests) +if bSkip: + raise unittest.SkipTest('*** %s does not exist ***' % system_tests.unit_tests) + +lines=system_tests.BT.runTest(system_tests.unit_tests) +for line in lines: + print(line) diff --git a/tests/bash_tests/version_test.py b/tests/bash_tests/version_test.py new file mode 100644 index 00000000..62cf67f4 --- /dev/null +++ b/tests/bash_tests/version_test.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +import system_tests +system_tests.BT.verbose_version(True) From 21b73b42072b6d4fb819d51858f5d010377e1694 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 07:30:59 +0000 Subject: [PATCH 04/11] Refactor CMakeList.txt to run all tests using tests/runner.py --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e267d49..73fdf96e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,14 +86,14 @@ add_subdirectory( src ) if( EXIV2_BUILD_UNIT_TESTS ) add_subdirectory ( unitTests ) add_custom_target(unit_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make unit_test - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/unit_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) endif() add_custom_target(version_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) if( EXIV2_BUILD_SAMPLES ) @@ -101,27 +101,27 @@ if( EXIV2_BUILD_SAMPLES ) # tests if( EXIV2_BUILD_UNIT_TESTS ) add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make unit_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/unit_test.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcasee.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) else() add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcasee.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) endif() add_custom_target(python_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) add_custom_target(bash_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) add_subdirectory( samples ) get_directory_property(SAMPLES DIRECTORY samples DEFINITION APPLICATIONS) From 310369505abe62c3cc68862828d06dd937d2a9a3 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 07:41:21 +0000 Subject: [PATCH 05/11] Add test/ReadMe.txt --- test/ReadMe.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test/ReadMe.txt diff --git a/test/ReadMe.txt b/test/ReadMe.txt new file mode 100644 index 00000000..2ca96a07 --- /dev/null +++ b/test/ReadMe.txt @@ -0,0 +1,2 @@ +The test scripts in this directory are not longer in service and will be removed in Exiv2 v0.28 +The functionality of the scripts in this directory is implemented in tests/bash_tests From 1fad29e11f3f3cd926ba0014cc0a1fe7ce5b86da Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 08:21:32 +0000 Subject: [PATCH 06/11] Fix typos. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73fdf96e..c7ef7648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,14 +102,14 @@ if( EXIV2_BUILD_SAMPLES ) if( EXIV2_BUILD_UNIT_TESTS ) add_custom_target(tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/unit_test.py - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcasee.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) else() add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcasee.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" From bf43c6cfd12de7c4e1bb58944bdcd2a363d7fe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 17 Mar 2021 09:42:43 +0100 Subject: [PATCH 07/11] Replace tabs to fix indentation issues --- CMakeLists.txt | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7ef7648..8fd160d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,37 +92,37 @@ if( EXIV2_BUILD_UNIT_TESTS ) endif() add_custom_target(version_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" ) if( EXIV2_BUILD_SAMPLES ) ## # tests if( EXIV2_BUILD_UNIT_TESTS ) - add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/unit_test.py - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" - ) + add_custom_target(tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/unit_test.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" + ) else() - add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" - ) + add_custom_target(tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/version_test.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" + ) endif() - add_custom_target(python_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" - ) - add_custom_target(bash_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" - ) + add_custom_target(python_tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" + ) + add_custom_target(bash_tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" python3 runner.py bash_tests/testcases.py --verbose + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/tests" + ) add_subdirectory( samples ) get_directory_property(SAMPLES DIRECTORY samples DEFINITION APPLICATIONS) add_dependencies(tests exiv2lib exiv2 ${SAMPLES}) From 354a8f6971c82462739d1a92a8a9b5788feb6708 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 09:14:54 +0000 Subject: [PATCH 08/11] Fix comments. --- tests/bash_tests/utils.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/bash_tests/utils.py b/tests/bash_tests/utils.py index 9ab575b1..f4647f39 100644 --- a/tests/bash_tests/utils.py +++ b/tests/bash_tests/utils.py @@ -688,27 +688,23 @@ def runTestCase(num, img): return str(out) def runTest(cmd): - """ - Executes a command in the shell. - Add this function at PR . - """ - exiv2=system_tests.exiv2 + """ Executes a command in the shell. """ if sys.platform == 'win32': args = cmd else: args = shlex.split(cmd) - # Updat PATH, LD_LIBRARY_PATH and DYLD_LIBRARY_PATH + # Update PATH, LD_LIBRARY_PATH and DYLD_LIBRARY_PATH key = "PATH" - bin_dir = os.path.dirname(exiv2) + bin_dir = os.path.dirname(system_tests.exiv2) if key in os.environ: os.environ[key] = os.path.join(bin_dir, os.environ[key]) else: os.environ[key] = bin_dir for key in ["LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"]: - lib_dir = os.path.join(os.path.dirname(os.path.dirname(exiv2)), 'lib') + lib_dir = os.path.join(os.path.dirname(os.path.dirname(system_tests.exiv2)), 'lib') if key in os.environ: os.environ[key] = os.path.join(lib_dir, os.environ[key]) else: From bbec658185815d57ad95238798d71b8992a34450 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 09:45:24 +0000 Subject: [PATCH 09/11] Fix LD_LIBRARY_PATH. Add option arg raw=False to runTest() Use raw=True in unit_test.py. --- tests/bash_tests/unit_test.py | 4 +--- tests/bash_tests/utils.py | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/bash_tests/unit_test.py b/tests/bash_tests/unit_test.py index 173b74f2..f3828345 100644 --- a/tests/bash_tests/unit_test.py +++ b/tests/bash_tests/unit_test.py @@ -8,6 +8,4 @@ bSkip=not os.path.isfile(system_tests.unit_tests) if bSkip: raise unittest.SkipTest('*** %s does not exist ***' % system_tests.unit_tests) -lines=system_tests.BT.runTest(system_tests.unit_tests) -for line in lines: - print(line) +system_tests.BT.runTest(system_tests.unit_tests,raw=True) diff --git a/tests/bash_tests/utils.py b/tests/bash_tests/utils.py index f4647f39..0f280c59 100644 --- a/tests/bash_tests/utils.py +++ b/tests/bash_tests/utils.py @@ -687,7 +687,7 @@ def runTestCase(num, img): out += diff('iii', 'ttt') return str(out) -def runTest(cmd): +def runTest(cmd,raw=False): """ Executes a command in the shell. """ if sys.platform == 'win32': @@ -706,20 +706,24 @@ def runTest(cmd): for key in ["LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"]: lib_dir = os.path.join(os.path.dirname(os.path.dirname(system_tests.exiv2)), 'lib') if key in os.environ: - os.environ[key] = os.path.join(lib_dir, os.environ[key]) + os.environ[key] = lib_dir + os.pathsep + os.environ[key] else: os.environ[key] = lib_dir # Execute the command - try: - p = subprocess.Popen(args, stdout=subprocess.PIPE, shell=False) - stdout, stderr = p.communicate() - if p.returncode != 0: - print('{} returncode = {}'.format(cmd, p.returncode)) - # Split the output by newline - out = stdout.decode('utf-8').replace('\r', '').rstrip('\n').split('\n') - except: - print('** {} died **'.format(cmd)) + if raw: + subprocess.Popen(args) + out=None + else: + try: + p = subprocess.Popen(args, stdout=subprocess.PIPE, shell=False) + stdout, stderr = p.communicate() + if p.returncode != 0: + print('{} returncode = {}'.format(cmd, p.returncode)) + # Split the output by newline + out = stdout.decode('utf-8').replace('\r', '').rstrip('\n').split('\n') + except: + print('** {} died **'.format(cmd)) return out From 72b73bb1460c56a7aa3d8d70f2df68d7eed9a0d9 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 09:54:54 +0000 Subject: [PATCH 10/11] Sniff for unit_tests.exe! --- tests/bash_tests/unit_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bash_tests/unit_test.py b/tests/bash_tests/unit_test.py index f3828345..bb6d7543 100644 --- a/tests/bash_tests/unit_test.py +++ b/tests/bash_tests/unit_test.py @@ -4,7 +4,7 @@ import system_tests import os import unittest -bSkip=not os.path.isfile(system_tests.unit_tests) +bSkip=not os.path.isfile(system_tests.unit_tests) and not os.path.isfile(system_tests.unit_tests + '.exe') if bSkip: raise unittest.SkipTest('*** %s does not exist ***' % system_tests.unit_tests) From da52bb3b0b548bf16fd280a35b9933ebe2701c6e Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 17 Mar 2021 10:10:32 +0000 Subject: [PATCH 11/11] Better logic and error message. --- tests/bash_tests/unit_test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/bash_tests/unit_test.py b/tests/bash_tests/unit_test.py index bb6d7543..844bbe7c 100644 --- a/tests/bash_tests/unit_test.py +++ b/tests/bash_tests/unit_test.py @@ -4,8 +4,11 @@ import system_tests import os import unittest -bSkip=not os.path.isfile(system_tests.unit_tests) and not os.path.isfile(system_tests.unit_tests + '.exe') +bSkip=not (os.path.isfile(system_tests.unit_tests) or os.path.isfile(system_tests.unit_tests + '.exe')) if bSkip: - raise unittest.SkipTest('*** %s does not exist ***' % system_tests.unit_tests) + msg='*** %s does not exist ***' % system_tests.unit_tests + print(msg) + raise unittest.SkipTest(msg) system_tests.BT.runTest(system_tests.unit_tests,raw=True) +print('')