fixed #12308 - adjusted Python test files to match pytest conventions (…

…#5870) This allows the tests to be picked up automatically instead of specifying patterns or filenames.
danmar · Jan 13, 2024 · c1da431 · c1da431
1 parent ac7a509
commit c1da431
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 20 deletions.
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -391,11 +391,11 @@ jobs:
       - name: Run test/cli
         run: |
           cd test/cli
-          python3 -m pytest -Werror --strict-markers -vv test-*.py
+          python3 -m pytest -Werror --strict-markers -vv
           cd ../../..
           ln -s cppcheck 'cpp check'
           cd 'cpp check/test/cli'
-          python3 -m pytest -Werror --strict-markers -vv test-*.py
+          python3 -m pytest -Werror --strict-markers -vv
 
       - name: Run cfg tests
         if: matrix.os != 'ubuntu-22.04'

diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
@@ -168,13 +168,7 @@ jobs:
           copy .\bin\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
           copy .\bin\cppcheck-core.dll .\cppcheck-core.dll || exit /b !errorlevel!
           cd test/cli || exit /b !errorlevel!
-          :: python -m pytest -Werror --strict-markers -vv --suppress-no-test-exit-code test-clang-import.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-helloworld.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-inline-suppress.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-more-projects.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-other.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-proj2.py || exit /b !errorlevel!
-          python -m pytest -Werror --strict-markers -vv test-suppress-syntaxError.py || exit /b !errorlevel!
+          python -m pytest -Werror --strict-markers -vv || exit /b !errorlevel!
 
       - name: Test addons
         if: matrix.config == 'release'

diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -98,7 +98,7 @@ jobs:
         run: |
           pwd=$(pwd)
           cd test/cli
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test-*.py
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
 
       - name: Generate dependencies
         if: false

diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
@@ -143,14 +143,14 @@ jobs:
       - name: test addons
         if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
         run: |
-          python -m pytest --strict-markers -vv addons/test/test-*.py
+          python -m pytest --strict-markers -vv addons/test
         env:
           PYTHONPATH: ./addons
 
       - name: test addons
         if: matrix.python-version != '3.9' && matrix.python-version != '3.10'
         run: |
-          python -m pytest -Werror --strict-markers -vv addons/test/test-*.py
+          python -m pytest -Werror --strict-markers -vv addons/test
         env:
           PYTHONPATH: ./addons
 
@@ -162,21 +162,21 @@ jobs:
 
       - name: test reduce
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/test_reduce.py
+          python -m pytest -Werror --strict-markers -vv tools/reduce_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_lib
         if: matrix.python-version != '2.7'
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/test_donate_cpu_lib.py
+          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_lib_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_server
         if: matrix.python-version != '2.7'
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/test_donate_cpu_server.py
+          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_server_test.py
         env:
           PYTHONPATH: ./tools
 

diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -97,7 +97,7 @@ jobs:
         run: |
           pwd=$(pwd)
           cd test/cli
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test-*.py
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
 
       - name: Generate dependencies
         if: false

diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
@@ -97,7 +97,7 @@ jobs:
         run: |
           pwd=$(pwd)
           cd test/cli
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test-*.py
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
 
       - name: Generate dependencies
         run: |

diff --git a/addons/test/test-misra.py → addons/test/misra_test.py b/addons/test/test-misra.py → addons/test/misra_test.py
diff --git a/addons/test/test-y2038.py → addons/test/y2038_test.py b/addons/test/test-y2038.py → addons/test/y2038_test.py
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -455,9 +455,11 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
         if (pos1 == std::string::npos)
             continue;
         std::string vcxproj(line.substr(pos1+1, pos-pos1+7));
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
         if (!Path::isAbsolute(vcxproj))
             vcxproj = path + vcxproj;
-        if (!importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString, fileFilters)) {
+        vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
+        if (!importVcxproj(vcxproj, variables, emptyString, fileFilters)) {
             printError("failed to load '" + vcxproj + "' from Visual Studio solution");
             return false;
         }

diff --git a/test/cli/test-clang-import.py → test/cli/clang-import_test.py b/test/cli/test-clang-import.py → test/cli/clang-import_test.py
@@ -4,6 +4,8 @@
 import os
 import re
 import subprocess
+import sys
+
 import pytest
 from testutils import cppcheck, assert_cppcheck
 
@@ -13,6 +15,11 @@
     pytest.skip("'clang' does not exist", allow_module_level=True)
 
 
+# the IDs differ with Visual Studio
+if sys.platform == 'win32':
+    pytest.skip(allow_module_level=True)
+
+
 def get_debug_section(title, stdout):
     s = re.sub(r'0x[0-9a-fA-F]+', '0x12345678', stdout)
     s = re.sub(r'nestedIn: Struct', 'nestedIn: Class', s)
@@ -129,7 +136,7 @@ def test_log(tmpdir):
 
     args = ['--clang', test_file]
     out_lines = [
-        'Checking {} ...'.format(test_file),
+        'Checking {} ...'.format(test_file).replace('\\', '/'),
     ]
 
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
diff --git a/test/cli/test-helloworld.py → test/cli/helloworld_test.py b/test/cli/test-helloworld.py → test/cli/helloworld_test.py
diff --git a/test/cli/test-inline-suppress.py → test/cli/inline-suppress_test.py b/test/cli/test-inline-suppress.py → test/cli/inline-suppress_test.py
diff --git a/test/cli/test-more-projects.py → test/cli/more-projects_test.py b/test/cli/test-more-projects.py → test/cli/more-projects_test.py
diff --git a/test/cli/test-other.py → test/cli/other_test.py b/test/cli/test-other.py → test/cli/other_test.py
diff --git a/test/cli/test-performance.py → test/cli/performance_test.py b/test/cli/test-performance.py → test/cli/performance_test.py
diff --git a/test/cli/test-proj2.py → test/cli/proj2_test.py b/test/cli/test-proj2.py → test/cli/proj2_test.py
diff --git a/test/cli/test-project.py → test/cli/project_test.py b/test/cli/test-project.py → test/cli/project_test.py
@@ -3,6 +3,7 @@
 import pytest
 import os
 import json
+import sys
 from testutils import cppcheck
 
 
@@ -49,6 +50,8 @@ def test_json_entry_file_not_found(tmpdir):
     ]
 
     expected = "'{}' from compilation database does not exist".format(os.path.join(tmpdir, "bug1.cpp"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
 
     _test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
 
@@ -117,7 +120,9 @@ def test_sln_project_file_not_found(tmpdir):
               "EndProject\r\n"
 
     expected = "Visual Studio project file is not a valid XML - XML_ERROR_FILE_NOT_FOUND\n" \
-               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "cli\\cli.vcxproj"))
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "cli/cli.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
 
     _test_project_error(tmpdir, "sln", content, expected)
 

diff --git a/test/cli/test-qml.py → test/cli/qml_test.py b/test/cli/test-qml.py → test/cli/qml_test.py
diff --git a/test/cli/test-suppress-syntaxError.py → test/cli/suppress-syntaxError_test.py b/test/cli/test-suppress-syntaxError.py → test/cli/suppress-syntaxError_test.py
diff --git a/tools/test_donate_cpu_lib.py → tools/donate_cpu_lib_test.py b/tools/test_donate_cpu_lib.py → tools/donate_cpu_lib_test.py
diff --git a/tools/test_donate_cpu_server.py → tools/donate_cpu_server_test.py b/tools/test_donate_cpu_server.py → tools/donate_cpu_server_test.py
diff --git a/tools/test_reduce.py → tools/reduce_test.py b/tools/test_reduce.py → tools/reduce_test.py