wip

Author: memsharded

test/functional/subsystems_build_test.py

@@ -118,22 +118,6 @@ def test_msys2(self, static):
         check_vs_runtime("app.exe", client, "15", "Debug", static_runtime=static,
                          subsystem="msys2")
 
-    @pytest.mark.parametrize("static", [True, False])
-    @pytest.mark.tool("mingw")
-    def test_mingw(self, static):
-        """
-        This will work if you installed the Mingw toolchain outside msys2, from
-        https://sourceforge.net/projects/mingw/, and installed gcc, autotools, mingw32-make, etc
-
-        But this doesn't contain "make", only "mingw32-make"
-        """
-        client = TestClient()
-        self._build(client, static_runtime=static, make="mingw32-make")
-
-        check_exe_run(client.out, "main", "gcc", None, "Debug", "x86", None, subsystem="mingw32")
-        check_vs_runtime("app.exe", client, "15", "Debug", static_runtime=static,
-                         subsystem="mingw64")
-
     @pytest.mark.parametrize("static", [True, False])
     @pytest.mark.tool("msys2")
     @pytest.mark.tool("mingw64")
@@ -436,7 +420,6 @@ def test_mingw64(self):
 
     @pytest.mark.tool("msys2")
     @pytest.mark.tool("msys2_clang64")
-    @pytest.mark.skip(reason="This doesn't work, seems CMake issue")
     def test_msys2_clang64(self):
         """
         FAILS WITH:

test/functional/toolchains/cmake/test_cps.py

@@ -518,70 +518,6 @@ def test(self):
     assert "liba_utils: Release!" in c.out
 
 
-@pytest.mark.skip(reason="Just to report to CMake upstream, and CPS feature request")
-@pytest.mark.tool("cmake", "4.2")
-def test_pure_cmake_shared():
-    c = TestClient()
-
-    cmake = textwrap.dedent("""\
-        set(CMAKE_CXX_COMPILER_WORKS 1)
-        set(CMAKE_CXX_ABI_COMPILED 1)
-        cmake_minimum_required(VERSION 4.2)
-        project(myproj CXX)
-
-        set(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO "b80be207-778e-46ba-8080-b23bba22639e")
-
-        # First library: core
-        add_library(mypkg_core src/mypkg_core.cpp)
-        target_include_directories(mypkg_core PUBLIC
-                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                    $<INSTALL_INTERFACE:include/core>)
-        set_target_properties(mypkg_core PROPERTIES PUBLIC_HEADER "include/mypkg_core.h")
-
-        # Second library: utils
-        add_library(mypkg_utils src/mypkg_utils.cpp)
-
-        target_include_directories(mypkg_utils PUBLIC
-                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                    $<INSTALL_INTERFACE:include/utils>)
-        set_target_properties(mypkg_utils PROPERTIES PUBLIC_HEADER "include/mypkg_utils.h")
-
-        target_link_libraries(mypkg_utils PRIVATE mypkg_core)
-
-        install(TARGETS mypkg_core EXPORT mypkg
-                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/core)
-        install(TARGETS mypkg_utils EXPORT mypkg
-                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/utils)
-
-        install(PACKAGE_INFO mypkg EXPORT mypkg)
-        """)
-
-    # Create source files for both libraries
-    core_cpp = gen_function_cpp(name="mypkg_core")
-    core_h = gen_function_h(name="mypkg_core")
-    utils_cpp = gen_function_cpp(name="mypkg_utils", includes=["mypkg_core"],
-                                 calls=["mypkg_core"])
-    utils_h = gen_function_h(name="mypkg_utils")
-
-    # First, try with the standard mypkg-config.cmake consumption
-    c.save({"CMakeLists.txt": cmake,
-            "src/mypkg_core.cpp": core_cpp,
-            "include/mypkg_core.h": core_h,
-            "src/mypkg_utils.cpp": utils_cpp,
-            "include/mypkg_utils.h": utils_h})
-
-    c.run_command(f"cmake . -DBUILD_SHARED_LIBS=ON")
-    print(c.out)
-    c.run_command("cmake --build . --config Release")
-    print(c.out)
-    c.run_command("cmake --install . --config Release --prefix=mypkginstall")
-    print(c.out)
-    cps = c.load("mypkginstall/cps/mypkg.cps")
-    print(cps)
-    cps_release = c.load("mypkginstall/cps/mypkg@release.cps")
-    print(cps_release)
-
-
 @pytest.mark.tool("cmake", "4.2")
 def test_cps_name_mapping():
     c = TestClient()

test/functional/toolchains/gnu/autotools/test_win_bash.py

@@ -69,12 +69,7 @@ def test_autotools_bash_complete_ucrt64():
     try:
         msys2_path = tools_locations["msys2"]["system"]["path"]["Windows"]
     except KeyError:
-        pytest.skip("msys2 path not defined")
-    try:
-        ucrt64_path = tools_locations["ucrt64"]["system"]["path"]["Windows"]
-        ucrt64_path = ucrt64_path.replace("\\", "/")
-    except KeyError:
-        pytest.skip("ucrt64 path not defined")
+        pytest.skip("msys2 path not defined")  # pragma: no cover
 
     client = TestClient(path_with_spaces=False)
     profile_win = textwrap.dedent(f"""
@@ -223,7 +218,7 @@ def test_add_msys2_path_automatically(scope):
     try:
         bash_path = tools_locations["msys2"]["system"]["path"]["Windows"] + "/bash.exe"
     except KeyError:
-        pytest.skip("msys2 path not defined")
+        pytest.skip("msys2 path not defined")  # pragma: no cover
 
     client.save_home({"global.conf": textwrap.dedent("""
             tools.microsoft.bash:subsystem=msys2
@@ -259,7 +254,7 @@ def test_conf_inherited_in_test_package():
     try:
         bash_path = tools_locations["msys2"]["system"]["path"]["Windows"] + "/bash.exe"
     except KeyError:
-        pytest.skip("msys2 path not defined")
+        pytest.skip("msys2 path not defined")  # pragma: no cover
 
     conanfile = textwrap.dedent("""
         from conan import ConanFile
@@ -422,9 +417,9 @@ def test_autotools_support_custom_make():
         bash_path = tools_locations["msys2"]["system"]["path"]["Windows"] + "/bash.exe"
         make_path = tools_locations["msys2"]["system"]["path"]["Windows"] + "/make.exe"
     except KeyError:
-        pytest.skip("msys2 path not defined")
+        pytest.skip("msys2 path not defined")  # pragma: no cover
     if not os.path.exists(make_path):
-        pytest.skip("msys2 make not installed")
+        pytest.skip("msys2 make not installed")  # pragma: no cover
 
     make_path = make_path.replace("/", "\\")
     assert os.path.exists(make_path)

test/functional/toolchains/gnu/test_pkg_config.py

@@ -74,7 +74,7 @@ def generate(self):
         assert "VARIABLES: /usr/local" in c.out
 
 
-def test_pkg_config_round_tripe_cpp_info():
+def test_pkg_config_round_trip_cpp_info():
     """ test that serialize and deserialize CppInfo works
     """
     try:
@@ -83,8 +83,7 @@ def test_pkg_config_round_tripe_cpp_info():
         os_ = platform.system()
         pkg_config_path = tools_locations["pkg_config"][version]["path"][os_] + "/" + exe
     except KeyError:
-        pytest.skip("pkg-config path not defined")
-        return
+        pytest.skip("pkg-config path not defined")  # pragma: no cover
 
     c = TestClient()
     conanfile = textwrap.dedent("""

test/integration/cache/backup_sources_test.py

@@ -605,10 +605,6 @@ def __init__(self, store=None):
 
             @staticmethod
             def _attach_to(app, store):  # noqa
-                @app.route("/internet/<file>", method=["GET"])
-                def get_internet_file(_):
-                    return HTTPError(401, "You Are Not Allowed Here")
-
                 @app.route("/downloader1/<file>", method=["GET"])
                 def get_file(file):
                     return static_file(file, http_server_base_folder_backup1)