adjusted some Python test results

Author: firewave

test/cli/inline-suppress_test.py

@@ -262,7 +262,6 @@ def test_build_dir_unused_template(tmpdir):
     __test_build_dir_unused_template(tmpdir, False)
 
 
-@pytest.mark.xfail(strict=True)
 def test_build_dir_unused_template_j(tmpdir):
     __test_build_dir_unused_template(tmpdir, True)
 
@@ -284,7 +283,7 @@ def test_suppress_unmatched_inline_suppression():  # 11172
     assert ret == 0, stdout
 
 
-# no error as inline suppressions are currently not being propagated back
+# TODO: should this error out?
 def test_duplicate(tmpdir):
     args = [
         '-q',
@@ -302,8 +301,8 @@ def test_duplicate(tmpdir):
     assert ret == 0, stdout
 
 
-# no error as inline suppressions are currently not being propagated back
-def test_duplicate_cmd(tmpdir):
+# no error as inline suppressions ars handled separately
+def __test_duplicate_cmd(tmpdir, extra_args):
     args = [
         '-q',
         '--template=simple',
@@ -314,15 +313,29 @@ def test_duplicate_cmd(tmpdir):
         'proj-inline-suppress/4.c'
     ]
 
+    args = args + extra_args
+
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
-    assert lines == []
+    # this is the suppression provided via the command-line which is unused because only the inline suppression is being matched
+    assert lines == [
+        'nofile:0:0: information: Unmatched suppression: unreadVariable [unmatchedSuppression]'
+    ]
     assert stdout == ''
     assert ret == 0, stdout
 
 
-# no error as inline suppressions are currently not being propagated back
-def test_duplicate_file(tmpdir):
+@pytest.mark.xfail(strict=True)
+def test_duplicate_cmd(tmpdir):
+    __test_duplicate_cmd(tmpdir, ['-j1'])
+
+
+def test_duplicate_cmd_j(tmpdir):
+    __test_duplicate_cmd(tmpdir, ['-j2'])
+
+
+# no error as inline suppressions ars handled separately
+def __test_duplicate_file(tmpdir, extra_args):
     suppr_file = os.path.join(tmpdir, 'suppressions')
     with open(suppr_file, 'wt') as f:
         f.write('''unreadVariable''')
@@ -337,13 +350,27 @@ def test_duplicate_file(tmpdir):
         'proj-inline-suppress/4.c'
     ]
 
+    args = args + extra_args
+
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
-    assert lines == []
+    # this is the suppression provided via the suppression file which is unused because only the inline suppression is being matched
+    assert lines == [
+        'nofile:0:0: information: Unmatched suppression: unreadVariable [unmatchedSuppression]'
+    ]
     assert stdout == ''
     assert ret == 0, stdout
 
 
+@pytest.mark.xfail(strict=True)
+def test_duplicate_file(tmpdir):
+    __test_duplicate_file(tmpdir, ['-j1'])
+
+
+def test_duplicate_file_j(tmpdir):
+    __test_duplicate_file(tmpdir, ['-j2'])
+
+
 # reporting of inline unusedFunction is deferred
 def __test_unused_function_unmatched(tmpdir, use_j):
     args = [

test/cli/unused_function_test.py

@@ -3,6 +3,8 @@
 
 import os
 import json
+import sys
+import pytest
 from testutils import cppcheck
 
 __script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -111,7 +113,12 @@ def test_unused_functions_compdb_j(tmpdir):
 def test_unused_functions_builddir(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
-    ret, stdout, stderr = cppcheck(['-q', '--template=simple', '--enable=unusedFunction', '--inline-suppr', '-j1', '--cppcheck-build-dir={}'.format(build_dir), __project_dir])
+    ret, stdout, stderr = cppcheck(['-q',
+                                    '--template=simple',
+                                    '--enable=unusedFunction',
+                                    '--inline-suppr',
+                                    '--cppcheck-build-dir={}'.format(build_dir),
+                                    __project_dir])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
         "{}3.c:3:0: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
@@ -120,10 +127,18 @@ def test_unused_functions_builddir(tmpdir):
 
 
 # TODO: only f3_3 is unused
-def test_unused_functions_builddir_j(tmpdir):
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_builddir_j_process(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
-    ret, stdout, stderr = cppcheck(['-q', '--template=simple', '--enable=unusedFunction', '--inline-suppr', '-j2', '--cppcheck-build-dir={}'.format(build_dir), __project_dir])
+    ret, stdout, stderr = cppcheck(['-q',
+                                    '--template=simple',
+                                    '--enable=unusedFunction',
+                                    '--inline-suppr',
+                                    '-j2',
+                                    '--executor=process',
+                                    '--cppcheck-build-dir={}'.format(build_dir),
+                                    __project_dir])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
         "{}1.c:4:0: style: The function 'f1' is never used. [unusedFunction]".format(__project_dir_sep),
@@ -142,8 +157,7 @@ def test_unused_functions_builddir_project(tmpdir):
                                     '--enable=unusedFunction',
                                     '--inline-suppr',
                                     '--project={}'.format(os.path.join(__project_dir, 'unusedFunction.cppcheck')),
-                                    '--cppcheck-build-dir={}'.format(build_dir),
-                                    '-j1'])
+                                    '--cppcheck-build-dir={}'.format(build_dir)])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
         "{}3.c:3:0: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
@@ -152,7 +166,8 @@ def test_unused_functions_builddir_project(tmpdir):
 
 
 # TODO: only f3_3 is unused
-def test_unused_functions_builddir_project_j(tmpdir):
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_builddir_project_j_process(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
     ret, stdout, stderr = cppcheck(['-q',
@@ -161,7 +176,8 @@ def test_unused_functions_builddir_project_j(tmpdir):
                                     '--inline-suppr',
                                     '--project={}'.format(os.path.join(__project_dir, 'unusedFunction.cppcheck')),
                                     '--cppcheck-build-dir={}'.format(build_dir),
-                                    '-j2'])
+                                    '-j2',
+                                    '--executor=process'])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
         "{}1.c:4:0: style: The function 'f1' is never used. [unusedFunction]".format(__project_dir_sep),
@@ -182,7 +198,6 @@ def test_unused_functions_builddir_compdb(tmpdir):
                                     '--inline-suppr',
                                     '--project={}'.format(compdb_file),
                                     '--cppcheck-build-dir={}'.format(build_dir),
-                                    '-j1'
                                     ])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
@@ -192,7 +207,8 @@ def test_unused_functions_builddir_compdb(tmpdir):
 
 
 # TODO: only f3_3 is unused
-def test_unused_functions_builddir_compdb_j(tmpdir):
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_builddir_compdb_j_process(tmpdir):
     compdb_file = __create_compdb(tmpdir, __project_dir)
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
@@ -202,7 +218,8 @@ def test_unused_functions_builddir_compdb_j(tmpdir):
                                     '--inline-suppr',
                                     '--project={}'.format(compdb_file),
                                     '--cppcheck-build-dir={}'.format(build_dir),
-                                    '-j2'
+                                    '-j2',
+                                    '--executor=process'
                                     ])
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [