Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-01-31 17:44:15 +00:00
parent e250bae356 5ab4623c2a
commit 2b787eb4b8
9 changed files with 61 additions and 32 deletions
@@ -34,8 +34,8 @@ def load_tests(loader, tests, pattern):
    else:
        print('WARNING: OpenCV tests config file ({}) is missing, running subset of tests'.format(config_file))

-    tests_pattern = os.environ.get('OPENCV_PYTEST_FILTER', 'test_') + '*.py'
-    if tests_pattern != 'test_*py':
+    tests_pattern = os.environ.get('OPENCV_PYTEST_FILTER', 'test_*') + '.py'
+    if tests_pattern != 'test_*.py':
        print('Tests filter: {}'.format(tests_pattern))

    processed = set()