diff --git a/.ci/jenkins/testsv2.jenkins b/.ci/jenkins/testsv2.jenkins index 3a304e3b46a..3e0085ea464 100644 --- a/.ci/jenkins/testsv2.jenkins +++ b/.ci/jenkins/testsv2.jenkins @@ -17,7 +17,7 @@ String getTempFolder(String nodeName) { List getConfigurations(String moduleName, String branchName, String jobName) { // TODO: handle revision cases def configs = [] - if (moduleName=="conans/test/unittests" || moduleName=="conans/test/integration") { + if (moduleName=="test/unittests" || moduleName=="test/integration") { configs.add([node: "Linux", pyvers: ["PY312"]]) } if (branchName =~ /(^PR-.*)/) { @@ -39,10 +39,10 @@ List getConfigurations(String moduleName, String branchName, String jobName } String getDockerImage(String moduleName) { - if (moduleName=="conans/test/unittests" || moduleName=="conans/test/integration") { + if (moduleName=="test/unittests" || moduleName=="test/integration") { return "conanio/ci-unittests" } - else if (moduleName=="conans/test/functional"){ + else if (moduleName=="test/functional"){ return "conanio/ci-functional" } return "" @@ -50,7 +50,7 @@ String getDockerImage(String moduleName) { boolean shouldTestServer(String moduleName) { // run conan_server --help after running functional tests - if (moduleName=="conans/test/functional") { + if (moduleName=="test/functional") { return true } return false @@ -167,7 +167,7 @@ void runTestsModule(String moduleName, String branchName, String jobName) { parallel(paralellRuns) } -def testModules = ["conans/test/unittests", "conans/test/integration", "conans/test/functional"] +def testModules = ["test/unittests", "test/integration", "test/functional"] void deployToPypiTest() { node("Linux") { @@ -198,7 +198,7 @@ void deployToPypiTest() { try { cancelPrevious() - + testModules.each { moduleName -> runTestsModule(moduleName, branchName, jobName) } diff --git a/.gitignore b/.gitignore index 8a9790835f4..cd3afe32d84 100644 --- a/.gitignore +++ b/.gitignore @@ -107,5 +107,5 @@ Session.vim # add excluded !conans/client/build !conan/tools/build -!conans/test/unittests/client/build -!conans/test/unittests/tools/build +!test/unittests/client/build +!test/unittests/tools/build diff --git a/conan/test/assets/pkg_cmake.py b/conan/test/assets/pkg_cmake.py index 373dac53c89..fd426210e97 100644 --- a/conan/test/assets/pkg_cmake.py +++ b/conan/test/assets/pkg_cmake.py @@ -1,8 +1,8 @@ import textwrap from conans.model.recipe_ref import RecipeReference -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_h, gen_function_cpp def pkg_cmake(name, version, requires=None, exe=False): diff --git a/conan/test/utils/file_server.py b/conan/test/utils/file_server.py index 9efae0bffcd..183c5c537b7 100644 --- a/conan/test/utils/file_server.py +++ b/conan/test/utils/file_server.py @@ -4,7 +4,7 @@ import bottle from webtest import TestApp -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import mkdir diff --git a/conan/test/utils/scm.py b/conan/test/utils/scm.py index 2279ab3bd8e..29b35d941f6 100644 --- a/conan/test/utils/scm.py +++ b/conan/test/utils/scm.py @@ -1,6 +1,6 @@ import os -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save_files, chdir from conans.util.runners import check_output_runner diff --git a/conan/test/utils/server_launcher.py b/conan/test/utils/server_launcher.py index 43612b6880a..bc062432fc7 100644 --- a/conan/test/utils/server_launcher.py +++ b/conan/test/utils/server_launcher.py @@ -10,7 +10,7 @@ from conans.server.migrate import migrate_and_get_server_config from conans.server.rest.server import ConanServer from conans.server.service.authorize import BasicAuthenticator, BasicAuthorizer -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder TESTING_REMOTE_PRIVATE_USER = "private_user" diff --git a/conan/test/utils/tools.py b/conan/test/utils/tools.py index 1ac1e4525eb..660d501498b 100644 --- a/conan/test/utils/tools.py +++ b/conan/test/utils/tools.py @@ -38,20 +38,50 @@ from conans.model.profile import Profile from conans.model.recipe_ref import RecipeReference from conans.model.settings import Settings -from conans.test.assets import copy_assets -from conans.test.assets.genconanfile import GenConanfile -from conans.test.conftest import default_profiles -from conans.test.utils.artifactory import ArtifactoryServer -from conans.test.utils.mocks import RedirectedInputStream -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.scm import create_local_git_repo -from conans.test.utils.server_launcher import (TestServerLauncher) -from conans.test.utils.test_files import temp_folder +from conan.test.assets import copy_assets +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.artifactory import ArtifactoryServer +from conan.test.utils.mocks import RedirectedInputStream +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.scm import create_local_git_repo +from conan.test.utils.server_launcher import (TestServerLauncher) +from conan.test.utils.test_files import temp_folder from conans.util.env import get_env from conans.util.files import mkdir, save_files, save, load NO_SETTINGS_PACKAGE_ID = "da39a3ee5e6b4b0d3255bfef95601890afd80709" +arch = platform.machine() +arch_setting = "armv8" if arch in ["arm64", "aarch64"] else arch +default_profiles = { + "Windows": textwrap.dedent("""\ + [settings] + os=Windows + arch=x86_64 + compiler=msvc + compiler.version=191 + compiler.runtime=dynamic + build_type=Release + """), + "Linux": textwrap.dedent(f"""\ + [settings] + os=Linux + arch={arch_setting} + compiler=gcc + compiler.version=8 + compiler.libcxx=libstdc++11 + build_type=Release + """), + "Darwin": textwrap.dedent(f"""\ + [settings] + os=Macos + arch={arch_setting} + compiler=apple-clang + compiler.version=13 + compiler.libcxx=libc++ + build_type=Release + """) +} def inc_recipe_manifest_timestamp(cache, reference, inc_time): ref = RecipeReference.loads(reference) @@ -548,7 +578,7 @@ def run(self, command_line, assert_error=False, redirect_stdout=None, redirect_s If user or password is filled, user_io will be mocked to return this tuple if required """ - from conans.test.utils.mocks import RedirectedTestOutput + from conan.test.utils.mocks import RedirectedTestOutput with environment_update({"NO_COLOR": "1"}): # Not initialize colorama in testing self.user_inputs = RedirectedInputStream(inputs or self.inputs) self.stdout = RedirectedTestOutput() # Initialize each command @@ -579,7 +609,7 @@ def run(self, command_line, assert_error=False, redirect_stdout=None, redirect_s save(os.path.join(self.current_folder, redirect_stderr), self.stderr) def run_command(self, command, cwd=None, assert_error=False): - from conans.test.utils.mocks import RedirectedTestOutput + from conan.test.utils.mocks import RedirectedTestOutput self.stdout = RedirectedTestOutput() # Initialize each command self.stderr = RedirectedTestOutput() try: diff --git a/setup.py b/setup.py index f61b72ae21f..45d16b8928e 100644 --- a/setup.py +++ b/setup.py @@ -14,10 +14,7 @@ # The tests utils are used by conan-package-tools here = path.abspath(path.dirname(__file__)) -excluded_test_packages = ["conans.test.{}*".format(d) - for d in os.listdir(os.path.join(here, "conans/test")) - if os.path.isdir(os.path.join(here, "conans/test", d)) and - d not in ("utils", "assets")] +excluded_test_packages = ["test"] def get_requires(filename): diff --git a/setup_server.py b/setup_server.py index fd0f809f513..821bdb07cba 100644 --- a/setup_server.py +++ b/setup_server.py @@ -17,10 +17,7 @@ # The tests utils are used by conan-package-tools here = path.abspath(path.dirname(__file__)) -excluded_test_packages = ["conans.test.{}*".format(d) - for d in os.listdir(os.path.join(here, "conans/test")) - if os.path.isdir(os.path.join(here, "conans/test", d)) and - d not in ("utils", "assets")] +excluded_test_packages = ["test"] def get_requires(filename): diff --git a/test/conftest.py b/test/conftest.py index 07b35c85b62..7c668e66617 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,7 +1,6 @@ import os import pathlib import platform -import textwrap import uuid from shutil import which @@ -188,40 +187,10 @@ # TODO: Make this match the default tools (compilers) above automatically -arch = platform.machine() -arch_setting = "armv8" if arch in ["arm64", "aarch64"] else arch -default_profiles = { - "Windows": textwrap.dedent("""\ - [settings] - os=Windows - arch=x86_64 - compiler=msvc - compiler.version=191 - compiler.runtime=dynamic - build_type=Release - """), - "Linux": textwrap.dedent(f"""\ - [settings] - os=Linux - arch={arch_setting} - compiler=gcc - compiler.version=8 - compiler.libcxx=libstdc++11 - build_type=Release - """), - "Darwin": textwrap.dedent(f"""\ - [settings] - os=Macos - arch={arch_setting} - compiler=apple-clang - compiler.version=13 - compiler.libcxx=libc++ - build_type=Release - """) -} + try: - from conans.test.conftest_user import tools_locations as user_tool_locations + from test.conftest_user import tools_locations as user_tool_locations def update(d, u): for k, v in u.items(): @@ -236,13 +205,6 @@ def update(d, u): user_tool_locations = None -try: - from conans.test.conftest_user import default_profiles as user_default_profiles - default_profiles.update(user_default_profiles) -except ImportError as e: - user_default_profiles = None - - tools_environments = { 'mingw32': {'Windows': {'MSYSTEM': 'MINGW32'}}, 'mingw64': {'Windows': {'MSYSTEM': 'MINGW64'}}, diff --git a/test/functional/build_helpers/cmake_ios_cross_build_test.py b/test/functional/build_helpers/cmake_ios_cross_build_test.py index 439fbce4b18..d306767509a 100644 --- a/test/functional/build_helpers/cmake_ios_cross_build_test.py +++ b/test/functional/build_helpers/cmake_ios_cross_build_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.xfail(reason="This was using legacy cmake_find_package generator, need to be tested " diff --git a/test/functional/command/config_install_test.py b/test/functional/command/config_install_test.py index 43114c6b56c..073baa8528b 100644 --- a/test/functional/command/config_install_test.py +++ b/test/functional/command/config_install_test.py @@ -11,10 +11,10 @@ from conans.client.conf.config_installer import _hide_password from conans.client.downloaders.file_downloader import FileDownloader from conans.paths import DEFAULT_CONAN_HOME -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.test_files import scan_folder, temp_folder, tgz_with_contents -from conans.test.utils.tools import TestClient, zipdir +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.test_files import scan_folder, temp_folder, tgz_with_contents +from conan.test.utils.tools import TestClient, zipdir from conans.util.files import load, mkdir, save, save_files diff --git a/test/functional/command/devflow_test.py b/test/functional/command/devflow_test.py index 7adfc0ebf0c..55ea6a0efd6 100644 --- a/test/functional/command/devflow_test.py +++ b/test/functional/command/devflow_test.py @@ -1,7 +1,7 @@ import os import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import load, mkdir conanfile = ''' diff --git a/test/functional/command/export_test.py b/test/functional/command/export_test.py index 9fc74db5110..1ef70709d76 100644 --- a/test/functional/command/export_test.py +++ b/test/functional/command/export_test.py @@ -2,9 +2,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.scm import git_add_changes_commit -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.scm import git_add_changes_commit +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/command/new_test.py b/test/functional/command/new_test.py index a1a10952e1d..02ef31084e8 100644 --- a/test/functional/command/new_test.py +++ b/test/functional/command/new_test.py @@ -1,6 +1,6 @@ import pytest as pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient # TODO: Remove this test once this feature is used elsewhere to test other things diff --git a/test/functional/command/profile_test.py b/test/functional/command/profile_test.py index e878860ce19..c700ca5912e 100644 --- a/test/functional/command/profile_test.py +++ b/test/functional/command/profile_test.py @@ -7,8 +7,8 @@ import pytest from conans.client.conf.detect import detect_defaults_settings -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.tools import TestClient, redirect_output +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.tools import TestClient, redirect_output from conans.util.env import environment_update from conans.util.files import save from conans.util.runners import check_output_runner diff --git a/test/functional/command/test_build.py b/test/functional/command/test_build.py index 8a45d026f03..ede8e31a118 100644 --- a/test/functional/command/test_build.py +++ b/test/functional/command/test_build.py @@ -2,8 +2,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_build_different_folders(): diff --git a/test/functional/command/test_custom_symlink_home.py b/test/functional/command/test_custom_symlink_home.py index 091ace37e7f..02e0cf3a292 100644 --- a/test/functional/command/test_custom_symlink_home.py +++ b/test/functional/command/test_custom_symlink_home.py @@ -3,9 +3,9 @@ import pytest -from conans.test.utils.scm import create_local_git_repo -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.scm import create_local_git_repo +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/command/test_install_deploy.py b/test/functional/command/test_install_deploy.py index f9fd31d42af..24bb1bd63ba 100644 --- a/test/functional/command/test_install_deploy.py +++ b/test/functional/command/test_install_deploy.py @@ -5,11 +5,11 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/conanfile/runner_test.py b/test/functional/conanfile/runner_test.py index 86bc5a4eff3..add79668766 100644 --- a/test/functional/conanfile/runner_test.py +++ b/test/functional/conanfile/runner_test.py @@ -2,7 +2,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class RunnerTest(unittest.TestCase): diff --git a/test/functional/graph/test_graph_build_mode.py b/test/functional/graph/test_graph_build_mode.py index c23d2c02b37..20261017f6f 100644 --- a/test/functional/graph/test_graph_build_mode.py +++ b/test/functional/graph/test_graph_build_mode.py @@ -1,6 +1,6 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/functional/graph/test_transitive_build_scripts.py b/test/functional/graph/test_transitive_build_scripts.py index fc032edaee1..65a4def1448 100644 --- a/test/functional/graph/test_transitive_build_scripts.py +++ b/test/functional/graph/test_transitive_build_scripts.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake") diff --git a/test/functional/layout/test_build_system_layout_helpers.py b/test/functional/layout/test_build_system_layout_helpers.py index 2e8858bcf92..a7ff450e86b 100644 --- a/test/functional/layout/test_build_system_layout_helpers.py +++ b/test/functional/layout/test_build_system_layout_helpers.py @@ -5,8 +5,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TurboTestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TurboTestClient from conans.util.files import save, load diff --git a/test/functional/layout/test_editable_cmake.py b/test/functional/layout/test_editable_cmake.py index 7fd00b57f33..02da2d79672 100644 --- a/test/functional/layout/test_editable_cmake.py +++ b/test/functional/layout/test_editable_cmake.py @@ -4,10 +4,10 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient def editable_cmake(generator, build_folder=None): diff --git a/test/functional/layout/test_editable_cmake_components.py b/test/functional/layout/test_editable_cmake_components.py index 18086ac5c64..db407274df6 100644 --- a/test/functional/layout/test_editable_cmake_components.py +++ b/test/functional/layout/test_editable_cmake_components.py @@ -2,8 +2,8 @@ import shutil import textwrap -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient def test_editable_cmake_components(): diff --git a/test/functional/layout/test_editable_msbuild.py b/test/functional/layout/test_editable_msbuild.py index 2dba0fa12c9..e36ef880b18 100644 --- a/test/functional/layout/test_editable_msbuild.py +++ b/test/functional/layout/test_editable_msbuild.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.pkg_cmake import pkg_cmake_app -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.pkg_cmake import pkg_cmake_app +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Only windows") diff --git a/test/functional/layout/test_exports_sources.py b/test/functional/layout/test_exports_sources.py index 8ee76788d98..79c59e08475 100644 --- a/test/functional/layout/test_exports_sources.py +++ b/test/functional/layout/test_exports_sources.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_exports_sources_patch(): diff --git a/test/functional/layout/test_in_cache.py b/test/functional/layout/test_in_cache.py index a46a12eb3d2..d539bb24a16 100644 --- a/test/functional/layout/test_in_cache.py +++ b/test/functional/layout/test_in_cache.py @@ -5,9 +5,9 @@ from conans.model.package_ref import PkgReference from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID @pytest.fixture diff --git a/test/functional/layout/test_in_subfolder.py b/test/functional/layout/test_in_subfolder.py index d31232f711f..d5285a1d9d4 100644 --- a/test/functional/layout/test_in_subfolder.py +++ b/test/functional/layout/test_in_subfolder.py @@ -2,9 +2,9 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient def test_exports_sources_own_code_in_subfolder(): diff --git a/test/functional/layout/test_layout_autopackage.py b/test/functional/layout/test_layout_autopackage.py index 0cc5f30fe8d..0231714b6b2 100644 --- a/test/functional/layout/test_layout_autopackage.py +++ b/test/functional/layout/test_layout_autopackage.py @@ -2,8 +2,8 @@ from conans.model.package_ref import PkgReference from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def get_latest_package_reference(cache, ref, pkgid): diff --git a/test/functional/layout/test_local_commands.py b/test/functional/layout/test_local_commands.py index 40668be97ec..e21641daaf2 100644 --- a/test/functional/layout/test_local_commands.py +++ b/test/functional/layout/test_local_commands.py @@ -2,9 +2,9 @@ import platform import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.pkg_cmake import pkg_cmake -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.pkg_cmake import pkg_cmake +from conan.test.utils.tools import TestClient def test_local_static_generators_folder(): diff --git a/test/functional/layout/test_source_folder.py b/test/functional/layout/test_source_folder.py index 15848093d55..59c237106d5 100644 --- a/test/functional/layout/test_source_folder.py +++ b/test/functional/layout/test_source_folder.py @@ -5,10 +5,10 @@ import mock import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient, zipdir +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient, zipdir app_name = "Release/my_app.exe" if platform.system() == "Windows" else "my_app" diff --git a/test/functional/only_source_test.py b/test/functional/only_source_test.py index 2a1a7cc0488..c5f9931ac68 100644 --- a/test/functional/only_source_test.py +++ b/test/functional/only_source_test.py @@ -2,8 +2,8 @@ import unittest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class OnlySourceTest(unittest.TestCase): diff --git a/test/functional/revisions_test.py b/test/functional/revisions_test.py index 1829b17b723..5aeea73756e 100644 --- a/test/functional/revisions_test.py +++ b/test/functional/revisions_test.py @@ -10,7 +10,7 @@ from conans.errors import RecipeNotFoundException from conans.model.recipe_ref import RecipeReference from conans.server.revision_list import RevisionList -from conans.test.utils.tools import TestServer, TurboTestClient, GenConanfile, TestClient +from conan.test.utils.tools import TestServer, TurboTestClient, GenConanfile, TestClient from conans.util.files import load diff --git a/test/functional/settings/conan_settings_preprocessor_test.py b/test/functional/settings/conan_settings_preprocessor_test.py index 3cf90504e26..f02a8fa9ac1 100644 --- a/test/functional/settings/conan_settings_preprocessor_test.py +++ b/test/functional/settings/conan_settings_preprocessor_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import load, save diff --git a/test/functional/settings/cppstd/compiler_cppstd_test.py b/test/functional/settings/cppstd/compiler_cppstd_test.py index af8342a15d3..528242915e8 100644 --- a/test/functional/settings/cppstd/compiler_cppstd_test.py +++ b/test/functional/settings/cppstd/compiler_cppstd_test.py @@ -5,8 +5,8 @@ from parameterized.parameterized import parameterized_class from conans.util.env import environment_update -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/settings/libcxx_setting_test.py b/test/functional/settings/libcxx_setting_test.py index 82d4fd104cf..82750897f31 100644 --- a/test/functional/settings/libcxx_setting_test.py +++ b/test/functional/settings/libcxx_setting_test.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.xfail(reason="Move this test to CMakeToolchain") diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py index 0ee61fb091f..0aef6154be2 100644 --- a/test/functional/subsystems_build_test.py +++ b/test/functional/subsystems_build_test.py @@ -4,10 +4,10 @@ import pytest import textwrap -from conans.test.assets.autotools import gen_makefile -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.utils import check_exe_run, check_vs_runtime -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile +from conan.test.assets.sources import gen_function_cpp +from test.functional.utils import check_exe_run, check_vs_runtime +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/functional/test_local_recipes_index.py b/test/functional/test_local_recipes_index.py index 5c17dac6ed6..fd01a7963a6 100644 --- a/test/functional/test_local_recipes_index.py +++ b/test/functional/test_local_recipes_index.py @@ -1,11 +1,11 @@ import os import textwrap -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, zipdir +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, zipdir from conans.util.files import save_files, sha256sum diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py index b33d1cb3010..24f6b3f8dcf 100644 --- a/test/functional/test_profile_detect_api.py +++ b/test/functional/test_profile_detect_api.py @@ -4,7 +4,7 @@ import pytest from conan.internal.api import detect_api -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestProfileDetectAPI: diff --git a/test/functional/test_third_party_patch_flow.py b/test/functional/test_third_party_patch_flow.py index 9065494d417..4813e76f745 100644 --- a/test/functional/test_third_party_patch_flow.py +++ b/test/functional/test_third_party_patch_flow.py @@ -1,9 +1,9 @@ import os import textwrap -from conans.test.utils.scm import create_local_git_repo -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.scm import create_local_git_repo +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import mkdir diff --git a/test/functional/toolchains/android/test_using_cmake.py b/test/functional/toolchains/android/test_using_cmake.py index dd229833f94..3b09d62c827 100644 --- a/test/functional/toolchains/android/test_using_cmake.py +++ b/test/functional/toolchains/android/test_using_cmake.py @@ -4,8 +4,8 @@ import pytest -from conans.test.conftest import tools_locations -from conans.test.utils.tools import TestClient +from test.conftest import tools_locations +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake", "3.23") # Android complains if <3.19 diff --git a/test/functional/toolchains/apple/test_xcodebuild.py b/test/functional/toolchains/apple/test_xcodebuild.py index e0a4e42dae7..a63e501f07b 100644 --- a/test/functional/toolchains/apple/test_xcodebuild.py +++ b/test/functional/toolchains/apple/test_xcodebuild.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient xcode_project = textwrap.dedent(""" name: app diff --git a/test/functional/toolchains/apple/test_xcodebuild_targets.py b/test/functional/toolchains/apple/test_xcodebuild_targets.py index ee56a36a613..bc1bb83c5bb 100644 --- a/test/functional/toolchains/apple/test_xcodebuild_targets.py +++ b/test/functional/toolchains/apple/test_xcodebuild_targets.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient xcode_project = textwrap.dedent(""" name: HelloLibrary diff --git a/test/functional/toolchains/apple/test_xcodedeps_build_configs.py b/test/functional/toolchains/apple/test_xcodedeps_build_configs.py index c4570003234..3d28f1dfb1a 100644 --- a/test/functional/toolchains/apple/test_xcodedeps_build_configs.py +++ b/test/functional/toolchains/apple/test_xcodedeps_build_configs.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient xcode_project = textwrap.dedent(""" diff --git a/test/functional/toolchains/apple/test_xcodedeps_components.py b/test/functional/toolchains/apple/test_xcodedeps_components.py index acb873b2628..f048560ed63 100644 --- a/test/functional/toolchains/apple/test_xcodedeps_components.py +++ b/test/functional/toolchains/apple/test_xcodedeps_components.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Only for MacOS") diff --git a/test/functional/toolchains/apple/test_xcodetoolchain.py b/test/functional/toolchains/apple/test_xcodetoolchain.py index e96e31ad681..c45614553d3 100644 --- a/test/functional/toolchains/apple/test_xcodetoolchain.py +++ b/test/functional/toolchains/apple/test_xcodetoolchain.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient test = textwrap.dedent(""" import os diff --git a/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py b/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py index dd0b5484b7a..7472636a36e 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py b/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py index 421c07e76b6..9162e9301e6 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py b/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py index 0436b0b1ff5..4052f3d5b26 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py @@ -3,11 +3,11 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient """ If we have a BR with transitive requires we won't generate 'xxx-config.cmake' files for them diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py index bcb82dc3338..68a0a86556b 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py @@ -1,15 +1,15 @@ import os import platform import textwrap -from conans.test.utils.mocks import ConanFileMock +from conan.test.utils.mocks import ConanFileMock import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.pkg_cmake import pkg_cmake -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.pkg_cmake import pkg_cmake +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID from conan.tools.files import replace_in_file diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py index 1d087965a31..af15205df31 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.assets.sources import gen_function_cpp +from conan.test.assets.sources import gen_function_cpp def test_aggregator(transitive_libraries): diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py index f27f18abd99..927cd8f798f 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py @@ -1,7 +1,7 @@ import textwrap import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient consumer = textwrap.dedent(""" from conan import ConanFile diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py index c8070da6e64..949d29f65ee 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Linux", reason="Only Linux") diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py index c009a42726c..8b7774f243b 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake") diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py index 8676860e703..d3cead0b9ea 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class PropagateSpecificComponents(unittest.TestCase): diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py index aaf9415de23..5f9a9cd2e7b 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py @@ -6,9 +6,9 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_h, gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.slow diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py index c7048d76050..4169b5f2779 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py @@ -6,9 +6,9 @@ import pytest from conans.client.conf import get_default_settings_yml -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py index 13d17759434..750e0ceabc0 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py @@ -2,10 +2,10 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py index f6b63b7403e..1c9a78af715 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py @@ -5,8 +5,8 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp @pytest.mark.skipif(platform.system() != "Windows", reason="Requires MSBuild") diff --git a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py index 5b31d427221..93dcb5b0dc4 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py b/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py index 27b7369a62e..05bfbf8da49 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_conditional_build_type(): diff --git a/test/functional/toolchains/cmake/cmakedeps/test_link_order.py b/test/functional/toolchains/cmake/cmakedeps/test_link_order.py index d97cc24cc39..d7d7ce901f1 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_link_order.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_link_order.py @@ -7,7 +7,7 @@ from jinja2 import Template from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient """ Check that the link order of libraries is preserved when using CMake generators diff --git a/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py b/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py index c0a6320b0a7..5aeb105d657 100644 --- a/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py +++ b/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py @@ -2,10 +2,10 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.pkg_cmake import pkg_cmake -from conans.test.assets.sources import gen_function_h, gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.pkg_cmake import pkg_cmake +from conan.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/functional/toolchains/cmake/test_cmake.py b/test/functional/toolchains/cmake/test_cmake.py index 7743cc9464a..bf10ea0509a 100644 --- a/test/functional/toolchains/cmake/test_cmake.py +++ b/test/functional/toolchains/cmake/test_cmake.py @@ -7,10 +7,10 @@ import pytest from parameterized.parameterized import parameterized -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.functional.utils import check_vs_runtime, check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from test.functional.utils import check_vs_runtime, check_exe_run +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py b/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py index 8fc5a121446..d71ef65dbf0 100644 --- a/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py +++ b/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py @@ -6,9 +6,9 @@ from conan.tools.env.environment import environment_wrap_command from conan.tools.files import replace_in_file -from conans.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import TestClient +from conan.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Linux", reason="Only Linux") diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py index 17ded05c24f..acd6c5ee11c 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py @@ -9,10 +9,10 @@ from conan.tools.cmake.presets import load_cmake_presets from conan.tools.microsoft.visual import vcvars_command from conans.model.recipe_ref import RecipeReference -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, TurboTestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, TurboTestClient from conans.util.files import save, load, rmdir diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py b/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py index d0190dad79f..06d50f7cefb 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Only OSX") diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py index f5222572b63..2a833dbd5ff 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py @@ -2,9 +2,9 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py index 2b0a03695e0..b7582bcfaf1 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py @@ -5,10 +5,10 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp, gen_function_c -from conans.test.functional.utils import check_vs_runtime, check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp, gen_function_c +from test.functional.utils import check_vs_runtime, check_exe_run +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py b/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py index 214dbfdb210..3906fa918ca 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def _add_message_status_flags(client): diff --git a/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py b/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py index cc0c6fbe74d..2b46aeaceb8 100644 --- a/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py +++ b/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py @@ -4,7 +4,7 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, TurboTestClient +from conan.test.utils.tools import TestClient, TurboTestClient ios10_armv8_settings = "-s os=iOS -s os.sdk=iphoneos -s os.version=10.0 -s arch=armv8" diff --git a/test/functional/toolchains/cmake/test_ninja.py b/test/functional/toolchains/cmake/test_ninja.py index 2c1223533e4..ccd48d5a6dc 100644 --- a/test/functional/toolchains/cmake/test_ninja.py +++ b/test/functional/toolchains/cmake/test_ninja.py @@ -5,11 +5,11 @@ from conan.tools.cmake import CMakeToolchain from conan.tools.cmake.presets import load_cmake_presets -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_h, gen_function_cpp -from conans.test.functional.utils import check_vs_runtime, check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_h, gen_function_cpp +from test.functional.utils import check_vs_runtime, check_exe_run +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/functional/toolchains/cmake/test_presets_inherit.py b/test/functional/toolchains/cmake/test_presets_inherit.py index 5f1826e8fa6..3678ca4f77d 100644 --- a/test/functional/toolchains/cmake/test_presets_inherit.py +++ b/test/functional/toolchains/cmake/test_presets_inherit.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake", "3.23") diff --git a/test/functional/toolchains/cmake/test_shared_cmake.py b/test/functional/toolchains/cmake/test_shared_cmake.py index f76deb5e0c8..50eab0e6bb4 100644 --- a/test/functional/toolchains/cmake/test_shared_cmake.py +++ b/test/functional/toolchains/cmake/test_shared_cmake.py @@ -5,8 +5,8 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app, pkg_cmake_test -from conans.test.utils.tools import TestClient +from conan.test.assets.pkg_cmake import pkg_cmake, pkg_cmake_app, pkg_cmake_test +from conan.test.utils.tools import TestClient from conans.util.files import rmdir diff --git a/test/functional/toolchains/cmake/test_universal_binaries.py b/test/functional/toolchains/cmake/test_universal_binaries.py index b4743c93030..45dcc2a5fe6 100644 --- a/test/functional/toolchains/cmake/test_universal_binaries.py +++ b/test/functional/toolchains/cmake/test_universal_binaries.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import rmdir diff --git a/test/functional/toolchains/cmake/test_v2_cmake_template.py b/test/functional/toolchains/cmake/test_v2_cmake_template.py index 16b7f872b9a..43f164ce75f 100644 --- a/test/functional/toolchains/cmake/test_v2_cmake_template.py +++ b/test/functional/toolchains/cmake/test_v2_cmake_template.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake") diff --git a/test/functional/toolchains/conftest.py b/test/functional/toolchains/conftest.py index 7f7308fde59..e1f294b62a6 100644 --- a/test/functional/toolchains/conftest.py +++ b/test/functional/toolchains/conftest.py @@ -3,8 +3,8 @@ import pytest -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient @pytest.fixture(scope="session") diff --git a/test/functional/toolchains/env/test_complete.py b/test/functional/toolchains/env/test_complete.py index 480acab83b2..48a5718eb2a 100644 --- a/test/functional/toolchains/env/test_complete.py +++ b/test/functional/toolchains/env/test_complete.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake") diff --git a/test/functional/toolchains/env/test_virtualenv_powershell.py b/test/functional/toolchains/env/test_virtualenv_powershell.py index 6b12c70c2d1..0f4e2e3f6bd 100644 --- a/test/functional/toolchains/env/test_virtualenv_powershell.py +++ b/test/functional/toolchains/env/test_virtualenv_powershell.py @@ -4,11 +4,11 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py b/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py index 0630d1d098f..9cfd841a815 100644 --- a/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py +++ b/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py @@ -5,9 +5,9 @@ import pytest from conan.tools.apple.apple import _to_apple_arch -from conans.test.assets.autotools import gen_makefile -from conans.test.assets.sources import gen_function_h, gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile +from conan.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.utils.tools import TestClient makefile = gen_makefile(apps=["app"], libs=["hello"]) diff --git a/test/functional/toolchains/gnu/autotools/test_basic.py b/test/functional/toolchains/gnu/autotools/test_basic.py index b94911f0979..ca0638607d3 100644 --- a/test/functional/toolchains/gnu/autotools/test_basic.py +++ b/test/functional/toolchains/gnu/autotools/test_basic.py @@ -8,11 +8,11 @@ from conan.tools.env.environment import environment_wrap_command from conans.model.recipe_ref import RecipeReference -from conans.test.assets.autotools import gen_makefile_am, gen_configure_ac, gen_makefile -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.utils import check_exe_run, check_vs_runtime -from conans.test.utils.tools import TestClient, TurboTestClient +from conan.test.assets.autotools import gen_makefile_am, gen_configure_ac, gen_makefile +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.sources import gen_function_cpp +from test.functional.utils import check_exe_run, check_vs_runtime +from conan.test.utils.tools import TestClient, TurboTestClient @pytest.mark.skipif(platform.system() not in ["Linux", "Darwin"], reason="Requires Autotools") diff --git a/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py b/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py index 05643f552c4..c3d39c2ef1c 100644 --- a/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py +++ b/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py @@ -2,7 +2,7 @@ import pytest import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() not in ["Darwin", "Linux"], reason="Autotools on Linux or macOS") def test_crossbuild_triplet_from_conf(): diff --git a/test/functional/toolchains/gnu/autotools/test_ios.py b/test/functional/toolchains/gnu/autotools/test_ios.py index 03256fdeb1d..7553eaa2533 100644 --- a/test/functional/toolchains/gnu/autotools/test_ios.py +++ b/test/functional/toolchains/gnu/autotools/test_ios.py @@ -4,9 +4,9 @@ import pytest from conan.tools.build import load_toolchain_args -from conans.test.assets.autotools import gen_makefile_am, gen_configure_ac -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile_am, gen_configure_ac +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Requires Xcode") diff --git a/test/functional/toolchains/gnu/autotools/test_win_bash.py b/test/functional/toolchains/gnu/autotools/test_win_bash.py index a94884038f4..613544dace1 100644 --- a/test/functional/toolchains/gnu/autotools/test_win_bash.py +++ b/test/functional/toolchains/gnu/autotools/test_win_bash.py @@ -3,11 +3,11 @@ import pytest -from conans.test.assets.autotools import gen_makefile_am, gen_configure_ac -from conans.test.assets.sources import gen_function_cpp -from conans.test.conftest import tools_locations -from conans.test.functional.utils import check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile_am, gen_configure_ac +from conan.test.assets.sources import gen_function_cpp +from test.conftest import tools_locations +from test.functional.utils import check_exe_run +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/toolchains/gnu/test_gnutoolchain_apple.py b/test/functional/toolchains/gnu/test_gnutoolchain_apple.py index ce146db9c18..e5543d54446 100644 --- a/test/functional/toolchains/gnu/test_gnutoolchain_apple.py +++ b/test/functional/toolchains/gnu/test_gnutoolchain_apple.py @@ -5,9 +5,9 @@ import pytest from conan.tools.apple.apple import _to_apple_arch -from conans.test.assets.autotools import gen_makefile -from conans.test.assets.sources import gen_function_h, gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile +from conan.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Only OSX") diff --git a/test/functional/toolchains/gnu/test_makedeps.py b/test/functional/toolchains/gnu/test_makedeps.py index b574fef70ab..b4963bdd11e 100644 --- a/test/functional/toolchains/gnu/test_makedeps.py +++ b/test/functional/toolchains/gnu/test_makedeps.py @@ -3,9 +3,9 @@ import platform import pytest -from conans.test.assets.autotools import gen_makefile -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient +from conan.test.assets.autotools import gen_makefile +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient from conan.tools.gnu.makedeps import CONAN_MAKEFILE_FILENAME diff --git a/test/functional/toolchains/gnu/test_pkg_config.py b/test/functional/toolchains/gnu/test_pkg_config.py index 85b1f5128b4..5b9105f25fc 100644 --- a/test/functional/toolchains/gnu/test_pkg_config.py +++ b/test/functional/toolchains/gnu/test_pkg_config.py @@ -3,8 +3,8 @@ import pytest -from conans.test.conftest import tools_locations -from conans.test.utils.tools import TestClient +from test.conftest import tools_locations +from conan.test.utils.tools import TestClient @pytest.mark.tool("pkg_config") diff --git a/test/functional/toolchains/gnu/test_pkgconfigdeps.py b/test/functional/toolchains/gnu/test_pkgconfigdeps.py index 55f3db759fb..802da3d2978 100644 --- a/test/functional/toolchains/gnu/test_pkgconfigdeps.py +++ b/test/functional/toolchains/gnu/test_pkgconfigdeps.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() == "Windows", reason="Needs pkg-config") diff --git a/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py b/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py index a3918df06c4..1d328cd8688 100644 --- a/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py +++ b/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("pkg_config") diff --git a/test/functional/toolchains/gnu/test_v2_autotools_template.py b/test/functional/toolchains/gnu/test_v2_autotools_template.py index 93c84e1f179..d4ee48731f3 100644 --- a/test/functional/toolchains/gnu/test_v2_autotools_template.py +++ b/test/functional/toolchains/gnu/test_v2_autotools_template.py @@ -5,7 +5,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() not in ["Linux", "Darwin"], reason="Requires Autotools") diff --git a/test/functional/toolchains/google/test_bazel.py b/test/functional/toolchains/google/test_bazel.py index e48cd6d089d..6ce6414eac2 100644 --- a/test/functional/toolchains/google/test_bazel.py +++ b/test/functional/toolchains/google/test_bazel.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py b/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py index 120f327c8ed..197887d506b 100644 --- a/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py +++ b/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Only for Darwin") diff --git a/test/functional/toolchains/intel/test_intel_cc.py b/test/functional/toolchains/intel/test_intel_cc.py index 00f308743fe..4618a688b12 100644 --- a/test/functional/toolchains/intel/test_intel_cc.py +++ b/test/functional/toolchains/intel/test_intel_cc.py @@ -2,8 +2,8 @@ import platform import textwrap -from conans.test.assets.pkg_cmake import pkg_cmake -from conans.test.utils.tools import TestClient +from conan.test.assets.pkg_cmake import pkg_cmake +from conan.test.utils.tools import TestClient @pytest.mark.tool("cmake") diff --git a/test/functional/toolchains/intel/test_using_msbuild.py b/test/functional/toolchains/intel/test_using_msbuild.py index d16d2a5540b..13df889a8cf 100644 --- a/test/functional/toolchains/intel/test_using_msbuild.py +++ b/test/functional/toolchains/intel/test_using_msbuild.py @@ -4,7 +4,7 @@ import textwrap from conan.tools.microsoft.visual import vcvars_command -from conans.test.assets.sources import gen_function_cpp +from conan.test.assets.sources import gen_function_cpp from ..microsoft.test_msbuild import sln_file, myapp_vcxproj conanfile_py = textwrap.dedent(""" diff --git a/test/functional/toolchains/ios/test_using_cmake.py b/test/functional/toolchains/ios/test_using_cmake.py index 2167f12b150..a209f00bd5d 100644 --- a/test/functional/toolchains/ios/test_using_cmake.py +++ b/test/functional/toolchains/ios/test_using_cmake.py @@ -5,7 +5,7 @@ import pytest from conan.tools.cmake import CMakeToolchain -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from ._utils import create_library diff --git a/test/functional/toolchains/meson/_base.py b/test/functional/toolchains/meson/_base.py index 41e1ff6ef94..df22c417a51 100644 --- a/test/functional/toolchains/meson/_base.py +++ b/test/functional/toolchains/meson/_base.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("meson") diff --git a/test/functional/toolchains/meson/test_backend.py b/test/functional/toolchains/meson/test_backend.py index a3da4b6e914..b6b6d1dfce7 100644 --- a/test/functional/toolchains/meson/test_backend.py +++ b/test/functional/toolchains/meson/test_backend.py @@ -5,8 +5,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.tool("meson") diff --git a/test/functional/toolchains/meson/test_cross_compilation.py b/test/functional/toolchains/meson/test_cross_compilation.py index a312cbf97bc..207d5536ead 100644 --- a/test/functional/toolchains/meson/test_cross_compilation.py +++ b/test/functional/toolchains/meson/test_cross_compilation.py @@ -5,10 +5,10 @@ import pytest from conan.tools.apple.apple import _to_apple_arch, XCRun -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.conftest import tools_locations -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from test.conftest import tools_locations +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import TestClient from conans.util.runners import conan_run _conanfile_py = textwrap.dedent(""" diff --git a/test/functional/toolchains/meson/test_install.py b/test/functional/toolchains/meson/test_install.py index ca0737aa9f4..c839d02f3f6 100644 --- a/test/functional/toolchains/meson/test_install.py +++ b/test/functional/toolchains/meson/test_install.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.functional.toolchains.meson._base import TestMesonBase +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from test.functional.toolchains.meson._base import TestMesonBase class MesonInstall(TestMesonBase): diff --git a/test/functional/toolchains/meson/test_meson.py b/test/functional/toolchains/meson/test_meson.py index e519a25f21f..a24f7960058 100644 --- a/test/functional/toolchains/meson/test_meson.py +++ b/test/functional/toolchains/meson/test_meson.py @@ -7,9 +7,9 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.functional.toolchains.meson._base import TestMesonBase -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from test.functional.toolchains.meson._base import TestMesonBase +from conan.test.utils.tools import TestClient class MesonToolchainTest(TestMesonBase): diff --git a/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py b/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py index 0d7930e5d18..db87fd29017 100644 --- a/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py +++ b/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py @@ -4,8 +4,8 @@ import pytest -from conans.test.functional.toolchains.meson._base import TestMesonBase -from conans.test.utils.tools import TestClient +from test.functional.toolchains.meson._base import TestMesonBase +from conan.test.utils.tools import TestClient class TestMesonToolchainAndGnuFlags(TestMesonBase): diff --git a/test/functional/toolchains/meson/test_meson_and_objc.py b/test/functional/toolchains/meson/test_meson_and_objc.py index 05a712804a4..b194d793cee 100644 --- a/test/functional/toolchains/meson/test_meson_and_objc.py +++ b/test/functional/toolchains/meson/test_meson_and_objc.py @@ -6,8 +6,8 @@ import pytest from conan.tools.apple.apple import _to_apple_arch, XCRun -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import TestClient +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import TestClient from conans.util.runners import conan_run _conanfile_py = textwrap.dedent(""" diff --git a/test/functional/toolchains/meson/test_meson_native_attribute.py b/test/functional/toolchains/meson/test_meson_native_attribute.py index a35c12861f7..599697eb858 100644 --- a/test/functional/toolchains/meson/test_meson_native_attribute.py +++ b/test/functional/toolchains/meson/test_meson_native_attribute.py @@ -5,9 +5,9 @@ import pytest from conan.tools.apple.apple import _to_apple_arch, XCRun -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import TestClient from conans.util.runners import conan_run diff --git a/test/functional/toolchains/meson/test_pkg_config_reuse.py b/test/functional/toolchains/meson/test_pkg_config_reuse.py index 79af71d5dd1..273049f86a7 100644 --- a/test/functional/toolchains/meson/test_pkg_config_reuse.py +++ b/test/functional/toolchains/meson/test_pkg_config_reuse.py @@ -3,8 +3,8 @@ import pytest import textwrap -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.toolchains.meson._base import TestMesonBase +from conan.test.assets.sources import gen_function_cpp +from test.functional.toolchains.meson._base import TestMesonBase @pytest.mark.tool("pkg_config") diff --git a/test/functional/toolchains/meson/test_preprocessor_definitions.py b/test/functional/toolchains/meson/test_preprocessor_definitions.py index a1584cd75b1..b3b772a4246 100644 --- a/test/functional/toolchains/meson/test_preprocessor_definitions.py +++ b/test/functional/toolchains/meson/test_preprocessor_definitions.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.functional.toolchains.meson._base import TestMesonBase +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from test.functional.toolchains.meson._base import TestMesonBase class MesonPreprocessorDefinitionsTest(TestMesonBase): diff --git a/test/functional/toolchains/meson/test_subproject.py b/test/functional/toolchains/meson/test_subproject.py index b225f088404..88738dc9a68 100644 --- a/test/functional/toolchains/meson/test_subproject.py +++ b/test/functional/toolchains/meson/test_subproject.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.sources import gen_function_c -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_c +from conan.test.utils.tools import TestClient _conanfile_py = textwrap.dedent(""" import os diff --git a/test/functional/toolchains/meson/test_test.py b/test/functional/toolchains/meson/test_test.py index b9f2f7f0b8c..2995c38123a 100644 --- a/test/functional/toolchains/meson/test_test.py +++ b/test/functional/toolchains/meson/test_test.py @@ -3,8 +3,8 @@ import pytest import textwrap -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.toolchains.meson._base import TestMesonBase +from conan.test.assets.sources import gen_function_cpp +from test.functional.toolchains.meson._base import TestMesonBase @pytest.mark.tool("pkg_config") diff --git a/test/functional/toolchains/meson/test_v2_meson_template.py b/test/functional/toolchains/meson/test_v2_meson_template.py index f143d371a68..c26ed1f7972 100644 --- a/test/functional/toolchains/meson/test_v2_meson_template.py +++ b/test/functional/toolchains/meson/test_v2_meson_template.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("meson") diff --git a/test/functional/toolchains/microsoft/test_msbuild.py b/test/functional/toolchains/microsoft/test_msbuild.py index 104813008ac..073eed151bd 100644 --- a/test/functional/toolchains/microsoft/test_msbuild.py +++ b/test/functional/toolchains/microsoft/test_msbuild.py @@ -6,9 +6,9 @@ from conan.tools.microsoft.visual import vcvars_command from conans.client.conf.detect_vs import vs_installation_path -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.utils import check_vs_runtime, check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from test.functional.utils import check_vs_runtime, check_exe_run +from conan.test.utils.tools import TestClient from conans.util.files import rmdir diff --git a/test/functional/toolchains/microsoft/test_msbuilddeps.py b/test/functional/toolchains/microsoft/test_msbuilddeps.py index 5551f171c9b..5c08c36c4ae 100644 --- a/test/functional/toolchains/microsoft/test_msbuilddeps.py +++ b/test/functional/toolchains/microsoft/test_msbuilddeps.py @@ -6,12 +6,12 @@ import pytest from parameterized import parameterized_class -from conans.test.assets.genconanfile import GenConanfile -from conans.test.assets.pkg_cmake import pkg_cmake -from conans.test.assets.sources import gen_function_cpp, gen_function_h -from conans.test.assets.visual_project_files import get_vs_project_files -from conans.test.conftest import tools_locations -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.assets.pkg_cmake import pkg_cmake +from conan.test.assets.sources import gen_function_cpp, gen_function_h +from conan.test.assets.visual_project_files import get_vs_project_files +from test.conftest import tools_locations +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID sln_file = r""" Microsoft Visual Studio Solution File, Format Version 12.00 diff --git a/test/functional/toolchains/microsoft/test_msbuilddeps_components.py b/test/functional/toolchains/microsoft/test_msbuilddeps_components.py index ce37427c1de..c7375f44c3e 100644 --- a/test/functional/toolchains/microsoft/test_msbuilddeps_components.py +++ b/test/functional/toolchains/microsoft/test_msbuilddeps_components.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows") diff --git a/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py b/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py index 0c68adc305a..af06f7c92ac 100644 --- a/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py +++ b/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py @@ -3,7 +3,7 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile +from conan.test.assets.genconanfile import GenConanfile @pytest.mark.skipif(platform.system() != "Windows", reason="Requires MSBuild") diff --git a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py index 2d454d50099..831c8c1f575 100644 --- a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py +++ b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows") diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py index 5364295d97d..b3b272a4d91 100644 --- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py +++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows") diff --git a/test/functional/toolchains/scons/test_sconsdeps.py b/test/functional/toolchains/scons/test_sconsdeps.py index 4d23a48af9e..f7d9760fdd3 100644 --- a/test/functional/toolchains/scons/test_sconsdeps.py +++ b/test/functional/toolchains/scons/test_sconsdeps.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Linux", reason="SCons functional tests" diff --git a/test/functional/toolchains/test_basic.py b/test/functional/toolchains/test_basic.py index 314b44e7907..4a55a9b6c08 100644 --- a/test/functional/toolchains/test_basic.py +++ b/test/functional/toolchains/test_basic.py @@ -5,7 +5,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class BasicTest(unittest.TestCase): diff --git a/test/functional/toolchains/test_msbuild_toolchain.py b/test/functional/toolchains/test_msbuild_toolchain.py index 0d4aa123fc7..05574dfc0a8 100644 --- a/test/functional/toolchains/test_msbuild_toolchain.py +++ b/test/functional/toolchains/test_msbuild_toolchain.py @@ -4,7 +4,7 @@ import pytest from parameterized import parameterized -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @parameterized.expand([("msvc", "190", "dynamic"), diff --git a/test/functional/toolchains/test_nmake_toolchain.py b/test/functional/toolchains/test_nmake_toolchain.py index 0460bab0de4..9ee8b30353f 100644 --- a/test/functional/toolchains/test_nmake_toolchain.py +++ b/test/functional/toolchains/test_nmake_toolchain.py @@ -3,9 +3,9 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.functional.utils import check_exe_run -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from test.functional.utils import check_exe_run +from conan.test.utils.tools import TestClient @pytest.mark.parametrize( diff --git a/test/functional/toolchains/test_txt_cmdline.py b/test/functional/toolchains/test_txt_cmdline.py index 3abb6e0f3d3..8e827822705 100644 --- a/test/functional/toolchains/test_txt_cmdline.py +++ b/test/functional/toolchains/test_txt_cmdline.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestTxtCommandLine(unittest.TestCase): diff --git a/test/functional/tools/scm/test_git.py b/test/functional/tools/scm/test_git.py index bc7bf1b6cbe..af733605437 100644 --- a/test/functional/tools/scm/test_git.py +++ b/test/functional/tools/scm/test_git.py @@ -5,11 +5,11 @@ import pytest -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_cpp -from conans.test.utils.scm import create_local_git_repo, git_add_changes_commit, git_create_bare_repo -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_cpp +from conan.test.utils.scm import create_local_git_repo, git_add_changes_commit, git_create_bare_repo +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import rmdir, save_files, save diff --git a/test/functional/tools/scm/test_git_get_commit.py b/test/functional/tools/scm/test_git_get_commit.py index 076a6ccc2be..af5a8b89c68 100644 --- a/test/functional/tools/scm/test_git_get_commit.py +++ b/test/functional/tools/scm/test_git_get_commit.py @@ -3,8 +3,8 @@ import pytest from conan.tools.scm import Git -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import TestClient +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import TestClient from conans.util.files import chdir from conans.util.runners import conan_run diff --git a/test/functional/tools/scm/test_version.py b/test/functional/tools/scm/test_version.py index 7c52bb49e79..1ecacc2bf47 100644 --- a/test/functional/tools/scm/test_version.py +++ b/test/functional/tools/scm/test_version.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_version(): diff --git a/test/functional/tools/system/package_manager_test.py b/test/functional/tools/system/package_manager_test.py index 8ec00fb5a50..fc030542e71 100644 --- a/test/functional/tools/system/package_manager_test.py +++ b/test/functional/tools/system/package_manager_test.py @@ -6,7 +6,7 @@ import pytest from conan.tools.system.package_manager import _SystemPackageManagerTool -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.tool("apt_get") diff --git a/test/functional/tools/test_apple_tools.py b/test/functional/tools/test_apple_tools.py index 63ce95eeb36..32456c17c02 100644 --- a/test/functional/tools/test_apple_tools.py +++ b/test/functional/tools/test_apple_tools.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Darwin", reason="Requires Xcode") diff --git a/test/functional/tools/test_files.py b/test/functional/tools/test_files.py index c6f5331661f..604654ae5c8 100644 --- a/test/functional/tools/test_files.py +++ b/test/functional/tools/test_files.py @@ -4,9 +4,9 @@ import patch_ng import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/functional/tools_versions_test.py b/test/functional/tools_versions_test.py index c06202cebfb..6e2947e380d 100644 --- a/test/functional/tools_versions_test.py +++ b/test/functional/tools_versions_test.py @@ -3,9 +3,9 @@ import pytest -from conans.test.assets.sources import gen_function_cpp -from conans.test.conftest import tools_locations -from conans.test.utils.tools import TestClient +from conan.test.assets.sources import gen_function_cpp +from test.conftest import tools_locations +from conan.test.utils.tools import TestClient class TestToolsCustomVersions: diff --git a/test/functional/util/test_cmd_args_to_string.py b/test/functional/util/test_cmd_args_to_string.py index 47cd9ca6177..a03d78c5cf4 100644 --- a/test/functional/util/test_cmd_args_to_string.py +++ b/test/functional/util/test_cmd_args_to_string.py @@ -5,7 +5,7 @@ import pytest from conan.tools.build import cmd_args_to_string -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import chdir from conans.util.runners import check_output_runner diff --git a/test/integration/build_requires/build_requires_test.py b/test/integration/build_requires/build_requires_test.py index b19f9eaff44..bdf8bc087f1 100644 --- a/test/integration/build_requires/build_requires_test.py +++ b/test/integration/build_requires/build_requires_test.py @@ -7,7 +7,7 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile @pytest.fixture() diff --git a/test/integration/build_requires/profile_build_requires_test.py b/test/integration/build_requires/profile_build_requires_test.py index 9a33d0b8c53..cda554a1ecd 100644 --- a/test/integration/build_requires/profile_build_requires_test.py +++ b/test/integration/build_requires/profile_build_requires_test.py @@ -4,7 +4,7 @@ import unittest from conans.paths import CONANFILE -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile tool_conanfile = """ diff --git a/test/integration/build_requires/test_build_requires_source_method.py b/test/integration/build_requires/test_build_requires_source_method.py index 15b3e2303b5..f2c251bba3f 100644 --- a/test/integration/build_requires/test_build_requires_source_method.py +++ b/test/integration/build_requires/test_build_requires_source_method.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestBuildEnvSource: diff --git a/test/integration/build_requires/test_install_test_build_require.py b/test/integration/build_requires/test_install_test_build_require.py index 6d0d90baece..148dfd2a35d 100644 --- a/test/integration/build_requires/test_install_test_build_require.py +++ b/test/integration/build_requires/test_install_test_build_require.py @@ -5,8 +5,8 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/integration/build_requires/test_relocatable_toolchain.py b/test/integration/build_requires/test_relocatable_toolchain.py index 97f624c70ea..f4232c3342c 100644 --- a/test/integration/build_requires/test_relocatable_toolchain.py +++ b/test/integration/build_requires/test_relocatable_toolchain.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_relocatable_toolchain(): diff --git a/test/integration/build_requires/test_toolchain_packages.py b/test/integration/build_requires/test_toolchain_packages.py index e923c64706c..d46a068a43a 100644 --- a/test/integration/build_requires/test_toolchain_packages.py +++ b/test/integration/build_requires/test_toolchain_packages.py @@ -2,7 +2,7 @@ import textwrap from conans.model.package_ref import PkgReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_android_ndk(): diff --git a/test/integration/cache/backup_sources_test.py b/test/integration/cache/backup_sources_test.py index db70e24c7d1..5cb40f1a11e 100644 --- a/test/integration/cache/backup_sources_test.py +++ b/test/integration/cache/backup_sources_test.py @@ -7,9 +7,9 @@ from bottle import static_file, HTTPError, request from conans.errors import NotFoundException, ConanException -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, StoppableThreadBottle +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, StoppableThreadBottle from conans.util.files import save, load, rmdir, mkdir, remove diff --git a/test/integration/cache/cache2_update_test.py b/test/integration/cache/cache2_update_test.py index 984b2e7c1a1..d14df60a7f7 100644 --- a/test/integration/cache/cache2_update_test.py +++ b/test/integration/cache/cache2_update_test.py @@ -6,8 +6,8 @@ from conans.model.recipe_ref import RecipeReference from conans.server.revision_list import RevisionList -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID class TestUpdateFlows: diff --git a/test/integration/cache/download_cache_test.py b/test/integration/cache/download_cache_test.py index 3cdf7b675bd..5f75c267b69 100644 --- a/test/integration/cache/download_cache_test.py +++ b/test/integration/cache/download_cache_test.py @@ -1,10 +1,10 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save, set_dirty diff --git a/test/integration/cache/rmdir_fail_test.py b/test/integration/cache/rmdir_fail_test.py index c02a7d7dc31..fd23dabd349 100644 --- a/test/integration/cache/rmdir_fail_test.py +++ b/test/integration/cache/rmdir_fail_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile @pytest.mark.skipif(platform.system() != "Windows", reason="needs windows") diff --git a/test/integration/cache/storage_path_test.py b/test/integration/cache/storage_path_test.py index 832b131adba..4403c4748bb 100644 --- a/test/integration/cache/storage_path_test.py +++ b/test/integration/cache/storage_path_test.py @@ -1,7 +1,7 @@ import os -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, GenConanfile def test_storage_path(): diff --git a/test/integration/cache/test_home_special_char.py b/test/integration/cache/test_home_special_char.py index edd684c4036..cce04e926f0 100644 --- a/test/integration/cache/test_home_special_char.py +++ b/test/integration/cache/test_home_special_char.py @@ -4,8 +4,8 @@ import pytest -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient import textwrap diff --git a/test/integration/cache/test_package_revisions.py b/test/integration/cache/test_package_revisions.py index bda2f0ab65e..821ac8350e7 100644 --- a/test/integration/cache/test_package_revisions.py +++ b/test/integration/cache/test_package_revisions.py @@ -1,7 +1,7 @@ from mock import mock -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/cache/test_same_pref_removal.py b/test/integration/cache/test_same_pref_removal.py index d8ad8f8422b..42b44ae42b5 100644 --- a/test/integration/cache/test_same_pref_removal.py +++ b/test/integration/cache/test_same_pref_removal.py @@ -1,7 +1,7 @@ import os -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_same_pref_removal(): diff --git a/test/integration/command/alias_test.py b/test/integration/command/alias_test.py index 56cd124d1c6..d8eb389b50d 100644 --- a/test/integration/command/alias_test.py +++ b/test/integration/command/alias_test.py @@ -3,7 +3,7 @@ import unittest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class ConanAliasTest(unittest.TestCase): diff --git a/test/integration/command/config_test.py b/test/integration/command/config_test.py index 820a3e7be80..8c5d7fc1da6 100644 --- a/test/integration/command/config_test.py +++ b/test/integration/command/config_test.py @@ -4,8 +4,8 @@ from conan.api.conan_api import ConanAPI from conans.model.conf import BUILT_IN_CONFS -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/command/create_test.py b/test/integration/command/create_test.py index 9158370df11..7aa9e659bb9 100644 --- a/test/integration/command/create_test.py +++ b/test/integration/command/create_test.py @@ -4,7 +4,7 @@ import textwrap from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID, GenConanfile +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID, GenConanfile from conans.util.files import load diff --git a/test/integration/command/download/download_parallel_test.py b/test/integration/command/download/download_parallel_test.py index 5317e73f61d..d1a87c15284 100644 --- a/test/integration/command/download/download_parallel_test.py +++ b/test/integration/command/download/download_parallel_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import GenConanfile, TestClient +from conan.test.utils.tools import GenConanfile, TestClient def test_basic_parallel_download(): diff --git a/test/integration/command/download/download_selected_packages_test.py b/test/integration/command/download/download_selected_packages_test.py index 1224bdbc57a..16b2061e06a 100644 --- a/test/integration/command/download/download_selected_packages_test.py +++ b/test/integration/command/download/download_selected_packages_test.py @@ -3,8 +3,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import load diff --git a/test/integration/command/download/download_test.py b/test/integration/command/download/download_test.py index 6af7c0974ca..e46b723f6c5 100644 --- a/test/integration/command/download/download_test.py +++ b/test/integration/command/download/download_test.py @@ -4,7 +4,7 @@ from unittest import mock from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID, GenConanfile +from conan.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID, GenConanfile from conans.util.files import load diff --git a/test/integration/command/download/test_download_patterns.py b/test/integration/command/download/test_download_patterns.py index 9c065fb2fdc..229aa896e30 100644 --- a/test/integration/command/download/test_download_patterns.py +++ b/test/integration/command/download/test_download_patterns.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/command/export/export_dirty_test.py b/test/integration/command/export/export_dirty_test.py index d302f818ae4..60ebb225cb4 100644 --- a/test/integration/command/export/export_dirty_test.py +++ b/test/integration/command/export/export_dirty_test.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import load diff --git a/test/integration/command/export/export_path_test.py b/test/integration/command/export/export_path_test.py index 803d8819db2..9a87684f370 100644 --- a/test/integration/command/export/export_path_test.py +++ b/test/integration/command/export/export_path_test.py @@ -4,8 +4,8 @@ import pytest from conans.model.manifest import FileTreeManifest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("relative_path", [False, True]) diff --git a/test/integration/command/export/export_test.py b/test/integration/command/export/export_test.py index 45b59432a5d..33f6ff3d1d6 100644 --- a/test/integration/command/export/export_test.py +++ b/test/integration/command/export/export_test.py @@ -11,7 +11,7 @@ from conans.model.manifest import FileTreeManifest from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE, CONAN_MANIFEST -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import load, save diff --git a/test/integration/command/export/exports_method_test.py b/test/integration/command/export/exports_method_test.py index aec985015dd..315c0c78f15 100644 --- a/test/integration/command/export/exports_method_test.py +++ b/test/integration/command/export/exports_method_test.py @@ -2,8 +2,8 @@ import textwrap import unittest -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save_files, load diff --git a/test/integration/command/export/test_export.py b/test/integration/command/export/test_export.py index 4b91f1f7999..d0ecfda4817 100644 --- a/test/integration/command/export/test_export.py +++ b/test/integration/command/export/test_export.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_basic(): diff --git a/test/integration/command/export_pkg_test.py b/test/integration/command/export_pkg_test.py index 3c52b662e5a..bb6f4cb13ac 100644 --- a/test/integration/command/export_pkg_test.py +++ b/test/integration/command/export_pkg_test.py @@ -7,7 +7,7 @@ from textwrap import dedent from conans.paths import CONANFILE -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import load diff --git a/test/integration/command/help_test.py b/test/integration/command/help_test.py index 3f23cd167e5..0e5665da981 100644 --- a/test/integration/command/help_test.py +++ b/test/integration/command/help_test.py @@ -1,5 +1,5 @@ from conans import __version__ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestHelp: diff --git a/test/integration/command/info/info_options_test.py b/test/integration/command/info/info_options_test.py index d26bfac66b9..b7d118434bc 100644 --- a/test/integration/command/info/info_options_test.py +++ b/test/integration/command/info/info_options_test.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_info_options(): diff --git a/test/integration/command/info/info_test.py b/test/integration/command/info/info_test.py index 65a3f03e9f1..be8b53186f1 100644 --- a/test/integration/command/info/info_test.py +++ b/test/integration/command/info/info_test.py @@ -4,7 +4,7 @@ from conan.cli.exit_codes import ERROR_GENERAL from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, GenConanfile, TurboTestClient +from conan.test.utils.tools import TestClient, GenConanfile, TurboTestClient class TestBasicCliOutput: diff --git a/test/integration/command/info/test_graph_info_graphical.py b/test/integration/command/info/test_graph_info_graphical.py index 6637f2299a4..11a99f139e8 100644 --- a/test/integration/command/info/test_graph_info_graphical.py +++ b/test/integration/command/info/test_graph_info_graphical.py @@ -3,7 +3,7 @@ import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class InfoTest(unittest.TestCase): diff --git a/test/integration/command/info/test_info_folders.py b/test/integration/command/info/test_info_folders.py index 8d27599afa0..d29b3f56c1b 100644 --- a/test/integration/command/info/test_info_folders.py +++ b/test/integration/command/info/test_info_folders.py @@ -4,7 +4,7 @@ import pytest from conans.paths import CONANFILE -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conan.internal.cache.conan_reference_layout import EXPORT_FOLDER conanfile_py = """ diff --git a/test/integration/command/install/install_cascade_test.py b/test/integration/command/install/install_cascade_test.py index d3d252c00a5..7dab0726087 100644 --- a/test/integration/command/install/install_cascade_test.py +++ b/test/integration/command/install/install_cascade_test.py @@ -2,7 +2,7 @@ from collections import OrderedDict from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestServer, TurboTestClient, GenConanfile +from conan.test.utils.tools import TestServer, TurboTestClient, GenConanfile class InstallCascadeTest(unittest.TestCase): diff --git a/test/integration/command/install/install_missing_dep_test.py b/test/integration/command/install/install_missing_dep_test.py index e369fb0ead5..9488869806e 100644 --- a/test/integration/command/install/install_missing_dep_test.py +++ b/test/integration/command/install/install_missing_dep_test.py @@ -1,7 +1,7 @@ import unittest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class InstallMissingDependency(unittest.TestCase): diff --git a/test/integration/command/install/install_parallel_test.py b/test/integration/command/install/install_parallel_test.py index a6f60ae4aeb..d0c64d10baf 100644 --- a/test/integration/command/install/install_parallel_test.py +++ b/test/integration/command/install/install_parallel_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import GenConanfile, TestClient +from conan.test.utils.tools import GenConanfile, TestClient class InstallParallelTest(unittest.TestCase): diff --git a/test/integration/command/install/install_test.py b/test/integration/command/install/install_test.py index b4855264b09..6d509ffef58 100644 --- a/test/integration/command/install/install_test.py +++ b/test/integration/command/install/install_test.py @@ -6,8 +6,8 @@ import pytest -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID -from conans.test.utils.tools import TestClient, TestServer, GenConanfile +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID +from conan.test.utils.tools import TestClient, TestServer, GenConanfile from conans.util.files import mkdir, save diff --git a/test/integration/command/install/install_update_test.py b/test/integration/command/install/install_update_test.py index 80fee448b01..42bbed328b6 100644 --- a/test/integration/command/install/install_update_test.py +++ b/test/integration/command/install/install_update_test.py @@ -3,7 +3,7 @@ from time import sleep from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import load diff --git a/test/integration/command/install/test_install_transitive.py b/test/integration/command/install/test_install_transitive.py index d5d0a51ccc7..3f82cdb0a2b 100644 --- a/test/integration/command/install/test_install_transitive.py +++ b/test/integration/command/install/test_install_transitive.py @@ -5,7 +5,7 @@ from conans.model.info import load_binary_info from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE_TXT, CONANINFO -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save, load diff --git a/test/integration/command/new_test.py b/test/integration/command/new_test.py index ecdd1e34285..b66533730aa 100644 --- a/test/integration/command/new_test.py +++ b/test/integration/command/new_test.py @@ -4,8 +4,8 @@ import pytest from conans import __version__ as client_version -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/command/remote_test.py b/test/integration/command/remote_test.py index 96c66843c74..d9b484f7e96 100644 --- a/test/integration/command/remote_test.py +++ b/test/integration/command/remote_test.py @@ -3,8 +3,8 @@ import unittest from collections import OrderedDict -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer from conans.util.files import load diff --git a/test/integration/command/remote_verify_ssl_test.py b/test/integration/command/remote_verify_ssl_test.py index 4ea68947e27..8ad93e8842c 100644 --- a/test/integration/command/remote_verify_ssl_test.py +++ b/test/integration/command/remote_verify_ssl_test.py @@ -2,7 +2,7 @@ from requests.models import Response -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient resp = Response() resp._content = b'{"results": []}' diff --git a/test/integration/command/remove_empty_dirs_test.py b/test/integration/command/remove_empty_dirs_test.py index 3fa8da12d2b..291a88cace6 100644 --- a/test/integration/command/remove_empty_dirs_test.py +++ b/test/integration/command/remove_empty_dirs_test.py @@ -1,8 +1,8 @@ import os import unittest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class RemoveEmptyDirsTest(unittest.TestCase): diff --git a/test/integration/command/remove_test.py b/test/integration/command/remove_test.py index 036b8e40e87..0f258276122 100644 --- a/test/integration/command/remove_test.py +++ b/test/integration/command/remove_test.py @@ -8,7 +8,7 @@ from conans.errors import NotFoundException from conans.model.package_ref import PkgReference from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer, GenConanfile +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer, GenConanfile from conans.util.env import environment_update conaninfo = ''' diff --git a/test/integration/command/runner_test.py b/test/integration/command/runner_test.py index f809236bd24..9a68ec67f37 100644 --- a/test/integration/command/runner_test.py +++ b/test/integration/command/runner_test.py @@ -2,9 +2,9 @@ import os import pytest import docker -from conans.test.utils.tools import TestClient -from conans.test.assets.cmake import gen_cmakelists -from conans.test.assets.sources import gen_function_h, gen_function_cpp +from conan.test.utils.tools import TestClient +from conan.test.assets.cmake import gen_cmakelists +from conan.test.assets.sources import gen_function_h, gen_function_cpp def docker_skip(test_image=None): diff --git a/test/integration/command/source_test.py b/test/integration/command/source_test.py index 1cc684d24fd..d04bf007437 100644 --- a/test/integration/command/source_test.py +++ b/test/integration/command/source_test.py @@ -7,8 +7,8 @@ import pytest from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer from conans.util.files import save diff --git a/test/integration/command/test_build.py b/test/integration/command/test_build.py index 81ea2c69c1c..0d8cbd0f046 100644 --- a/test/integration/command/test_build.py +++ b/test/integration/command/test_build.py @@ -1,7 +1,7 @@ import json -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_build_cmd_deploy_generators(): diff --git a/test/integration/command/test_forced_download_source.py b/test/integration/command/test_forced_download_source.py index 7353b456c0f..dfe81481562 100644 --- a/test/integration/command/test_forced_download_source.py +++ b/test/integration/command/test_forced_download_source.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture() diff --git a/test/integration/command/test_package_test.py b/test/integration/command/test_package_test.py index 4283c8e3bda..6b8cc8f2133 100644 --- a/test/integration/command/test_package_test.py +++ b/test/integration/command/test_package_test.py @@ -5,7 +5,7 @@ from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, GenConanfile +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, GenConanfile from conans.util.files import load diff --git a/test/integration/command/test_profile.py b/test/integration/command/test_profile.py index 8de40adbb46..d6965f84d5d 100644 --- a/test/integration/command/test_profile.py +++ b/test/integration/command/test_profile.py @@ -2,7 +2,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_profile_path(): diff --git a/test/integration/command/upload/syncronize_test.py b/test/integration/command/upload/syncronize_test.py index d354b07a13d..ddeede375b2 100644 --- a/test/integration/command/upload/syncronize_test.py +++ b/test/integration/command/upload/syncronize_test.py @@ -5,9 +5,9 @@ from conans.model.manifest import FileTreeManifest from conans.model.recipe_ref import RecipeReference from conans.paths import EXPORT_TGZ_NAME -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, TestServer from conans.util.files import load diff --git a/test/integration/command/upload/test_upload_bundle.py b/test/integration/command/upload/test_upload_bundle.py index d5f72209c96..3e3bf7c4b68 100644 --- a/test/integration/command/upload/test_upload_bundle.py +++ b/test/integration/command/upload/test_upload_bundle.py @@ -2,8 +2,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_upload_bundle(): diff --git a/test/integration/command/upload/test_upload_parallel.py b/test/integration/command/upload/test_upload_parallel.py index 6ce6b31fe5a..73aff62829b 100644 --- a/test/integration/command/upload/test_upload_parallel.py +++ b/test/integration/command/upload/test_upload_parallel.py @@ -1,7 +1,7 @@ from requests import ConnectionError -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestRequester def test_upload_parallel_error(): diff --git a/test/integration/command/upload/test_upload_patterns.py b/test/integration/command/upload/test_upload_patterns.py index 699ef32a5b4..ef5567461a2 100644 --- a/test/integration/command/upload/test_upload_patterns.py +++ b/test/integration/command/upload/test_upload_patterns.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/command/upload/upload_complete_test.py b/test/integration/command/upload/upload_complete_test.py index 84ade0d1ea5..79b23a579e4 100644 --- a/test/integration/command/upload/upload_complete_test.py +++ b/test/integration/command/upload/upload_complete_test.py @@ -4,7 +4,7 @@ from requests import ConnectionError from conans.paths import CONAN_MANIFEST -from conans.test.utils.tools import (TestClient, TestRequester, TestServer, +from conan.test.utils.tools import (TestClient, TestRequester, TestServer, GenConanfile) from conans.util.env import environment_update diff --git a/test/integration/command/upload/upload_compression_test.py b/test/integration/command/upload/upload_compression_test.py index e1f6f03e05d..3eb271638e6 100644 --- a/test/integration/command/upload/upload_compression_test.py +++ b/test/integration/command/upload/upload_compression_test.py @@ -1,9 +1,9 @@ import os from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import uncompress_packaged_files -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import uncompress_packaged_files +from conan.test.utils.tools import TestClient def test_reuse_uploaded_tgz(): diff --git a/test/integration/command/upload/upload_test.py b/test/integration/command/upload/upload_test.py index b9287a296a9..d77ed839bba 100644 --- a/test/integration/command/upload/upload_test.py +++ b/test/integration/command/upload/upload_test.py @@ -14,7 +14,7 @@ from conans.model.package_ref import PkgReference from conans.model.recipe_ref import RecipeReference from conans.paths import EXPORT_SOURCES_TGZ_NAME, PACKAGE_TGZ_NAME -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer, \ +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer, \ TurboTestClient, GenConanfile, TestRequester, TestingResponse from conans.util.files import gzopen_without_timestamps, is_dirty, save, set_dirty diff --git a/test/integration/command/user_test.py b/test/integration/command/user_test.py index b81b517bdf6..e071415ecd3 100644 --- a/test/integration/command/user_test.py +++ b/test/integration/command/user_test.py @@ -6,7 +6,7 @@ from datetime import timedelta from conans.client.store.localdb import LocalDB -from conans.test.utils.tools import TestClient, TestServer +from conan.test.utils.tools import TestClient, TestServer from conans.util.env import environment_update diff --git a/test/integration/command_v2/custom_commands_test.py b/test/integration/command_v2/custom_commands_test.py index d57e54d7cc9..6a75beec3f8 100644 --- a/test/integration/command_v2/custom_commands_test.py +++ b/test/integration/command_v2/custom_commands_test.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/command_v2/help_test.py b/test/integration/command_v2/help_test.py index 1696466005f..2df01a5c70e 100644 --- a/test/integration/command_v2/help_test.py +++ b/test/integration/command_v2/help_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_help_command(): diff --git a/test/integration/command_v2/list_test.py b/test/integration/command_v2/list_test.py index fffb4acbe69..8da89272e79 100644 --- a/test/integration/command_v2/list_test.py +++ b/test/integration/command_v2/list_test.py @@ -9,8 +9,8 @@ import pytest from conans.errors import ConanException, ConanConnectionError -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID from conans.util.env import environment_update from conans.util.files import load, save diff --git a/test/integration/command_v2/search_test.py b/test/integration/command_v2/search_test.py index be4ff12aa3d..352c86771bd 100644 --- a/test/integration/command_v2/search_test.py +++ b/test/integration/command_v2/search_test.py @@ -6,8 +6,8 @@ from conans.errors import ConanConnectionError, ConanException from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer # FIXME: we could remove this whenever @conan_alias_command will be implemented diff --git a/test/integration/command_v2/test_cache_clean.py b/test/integration/command_v2/test_cache_clean.py index ef0f2c00b27..ad5a64173b1 100644 --- a/test/integration/command_v2/test_cache_clean.py +++ b/test/integration/command_v2/test_cache_clean.py @@ -1,9 +1,9 @@ import os.path import re -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/command_v2/test_cache_integrity.py b/test/integration/command_v2/test_cache_integrity.py index 997173838c2..324f9050f02 100644 --- a/test/integration/command_v2/test_cache_integrity.py +++ b/test/integration/command_v2/test_cache_integrity.py @@ -1,7 +1,7 @@ import os -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/command_v2/test_cache_path.py b/test/integration/command_v2/test_cache_path.py index 52aef7bd4dd..d95c145b47b 100644 --- a/test/integration/command_v2/test_cache_path.py +++ b/test/integration/command_v2/test_cache_path.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py index 53c8dda3af2..cc4fb30b127 100644 --- a/test/integration/command_v2/test_cache_save_restore.py +++ b/test/integration/command_v2/test_cache_save_restore.py @@ -5,9 +5,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save, load diff --git a/test/integration/command_v2/test_combined_pkglist_flows.py b/test/integration/command_v2/test_combined_pkglist_flows.py index 86240065541..64d5f28c30d 100644 --- a/test/integration/command_v2/test_combined_pkglist_flows.py +++ b/test/integration/command_v2/test_combined_pkglist_flows.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer class TestListUpload: diff --git a/test/integration/command_v2/test_graph_find_binaries.py b/test/integration/command_v2/test_graph_find_binaries.py index 385d4e4efa5..fd7e0eb1585 100644 --- a/test/integration/command_v2/test_graph_find_binaries.py +++ b/test/integration/command_v2/test_graph_find_binaries.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestFilterProfile: diff --git a/test/integration/command_v2/test_info_build_order.py b/test/integration/command_v2/test_info_build_order.py index 9909b3ef187..cf95afb5429 100644 --- a/test/integration/command_v2/test_info_build_order.py +++ b/test/integration/command_v2/test_info_build_order.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_info_build_order(): diff --git a/test/integration/command_v2/test_inspect.py b/test/integration/command_v2/test_inspect.py index 2f186decdc5..129ee376181 100644 --- a/test/integration/command_v2/test_inspect.py +++ b/test/integration/command_v2/test_inspect.py @@ -1,8 +1,8 @@ import json import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_basic_inspect(): diff --git a/test/integration/command_v2/test_list_lru.py b/test/integration/command_v2/test_list_lru.py index 052e597658b..f1bb46131a6 100644 --- a/test/integration/command_v2/test_list_lru.py +++ b/test/integration/command_v2/test_list_lru.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestLRU: diff --git a/test/integration/command_v2/test_outdated.py b/test/integration/command_v2/test_outdated.py index 1e05ac32938..c5294cf7372 100644 --- a/test/integration/command_v2/test_outdated.py +++ b/test/integration/command_v2/test_outdated.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer @pytest.fixture diff --git a/test/integration/command_v2/test_output.py b/test/integration/command_v2/test_output.py index 5766e895ae3..9c4b570c6a4 100644 --- a/test/integration/command_v2/test_output.py +++ b/test/integration/command_v2/test_output.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/command_v2/test_version.py b/test/integration/command_v2/test_version.py index 3f397d1059c..bd0932a02b8 100644 --- a/test/integration/command_v2/test_version.py +++ b/test/integration/command_v2/test_version.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conan import __version__ import json import platform diff --git a/test/integration/conan_api/list_test.py b/test/integration/conan_api/list_test.py index 4e406909048..6e3c68c8376 100644 --- a/test/integration/conan_api/list_test.py +++ b/test/integration/conan_api/list_test.py @@ -3,8 +3,8 @@ from conan.api.conan_api import ConanAPI from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TurboTestClient, TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TurboTestClient, TestClient def _pref_gen(): diff --git a/test/integration/conan_api/search_test.py b/test/integration/conan_api/search_test.py index ab26c6bf38e..7eab145bc56 100644 --- a/test/integration/conan_api/search_test.py +++ b/test/integration/conan_api/search_test.py @@ -1,7 +1,7 @@ from conan.api.conan_api import ConanAPI from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TurboTestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TurboTestClient def test_search_recipes(): diff --git a/test/integration/conan_api/test_cli.py b/test/integration/conan_api/test_cli.py index 10804ba0dda..be4d1a1fce4 100644 --- a/test/integration/conan_api/test_cli.py +++ b/test/integration/conan_api/test_cli.py @@ -1,8 +1,8 @@ from conan.api.conan_api import ConanAPI from conan.cli.cli import Cli -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output def test_cli(): diff --git a/test/integration/conan_v2/test_legacy_cpp_info.py b/test/integration/conan_v2/test_legacy_cpp_info.py index 25f1d33a63a..83d042ff7dd 100644 --- a/test/integration/conan_v2/test_legacy_cpp_info.py +++ b/test/integration/conan_v2/test_legacy_cpp_info.py @@ -1,8 +1,8 @@ import textwrap from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import load, save diff --git a/test/integration/conanfile/conan_data_test.py b/test/integration/conanfile/conan_data_test.py index a358bc986a8..f81e144e025 100644 --- a/test/integration/conanfile/conan_data_test.py +++ b/test/integration/conanfile/conan_data_test.py @@ -8,9 +8,9 @@ import yaml from conans.model.recipe_ref import RecipeReference -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.test_files import tgz_with_contents -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.test_files import tgz_with_contents +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import md5sum, sha1sum, sha256sum, load diff --git a/test/integration/conanfile/conanfile_errors_test.py b/test/integration/conanfile/conanfile_errors_test.py index a9c27c58a53..028c974ba91 100644 --- a/test/integration/conanfile/conanfile_errors_test.py +++ b/test/integration/conanfile/conanfile_errors_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ConanfileErrorsTest(unittest.TestCase): diff --git a/test/integration/conanfile/conanfile_helpers_test.py b/test/integration/conanfile/conanfile_helpers_test.py index d9865c64566..6ec78669d9a 100644 --- a/test/integration/conanfile/conanfile_helpers_test.py +++ b/test/integration/conanfile/conanfile_helpers_test.py @@ -2,7 +2,7 @@ from parameterized.parameterized import parameterized -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ConanfileHelpersTest(unittest.TestCase): diff --git a/test/integration/conanfile/folders_access_test.py b/test/integration/conanfile/folders_access_test.py index 7c217eb9efa..8b05e97c175 100644 --- a/test/integration/conanfile/folders_access_test.py +++ b/test/integration/conanfile/folders_access_test.py @@ -1,8 +1,8 @@ import textwrap import unittest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient conanfile_parent = """ diff --git a/test/integration/conanfile/generators_list_test.py b/test/integration/conanfile/generators_list_test.py index c2890d94e92..c114b5da85b 100644 --- a/test/integration/conanfile/generators_list_test.py +++ b/test/integration/conanfile/generators_list_test.py @@ -1,7 +1,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ConanfileRepeatedGeneratorsTestCase(unittest.TestCase): diff --git a/test/integration/conanfile/init_test.py b/test/integration/conanfile/init_test.py index 1b43271058a..5fe9351e83e 100644 --- a/test/integration/conanfile/init_test.py +++ b/test/integration/conanfile/init_test.py @@ -1,7 +1,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class InitTest(unittest.TestCase): diff --git a/test/integration/conanfile/invalid_configuration_test.py b/test/integration/conanfile/invalid_configuration_test.py index ea11d8e8094..52566ad7659 100644 --- a/test/integration/conanfile/invalid_configuration_test.py +++ b/test/integration/conanfile/invalid_configuration_test.py @@ -1,7 +1,7 @@ import unittest from conan.cli.exit_codes import ERROR_INVALID_CONFIGURATION -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class InvalidConfigurationTest(unittest.TestCase): diff --git a/test/integration/conanfile/load_requires_file_test.py b/test/integration/conanfile/load_requires_file_test.py index b589b9bba78..b4a14883b48 100644 --- a/test/integration/conanfile/load_requires_file_test.py +++ b/test/integration/conanfile/load_requires_file_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestLoadRequirementsTextFileTest: diff --git a/test/integration/conanfile/no_copy_source_test.py b/test/integration/conanfile/no_copy_source_test.py index 77ee4e42542..bfa54ac84e9 100644 --- a/test/integration/conanfile/no_copy_source_test.py +++ b/test/integration/conanfile/no_copy_source_test.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_no_copy_source(): diff --git a/test/integration/conanfile/required_conan_version_test.py b/test/integration/conanfile/required_conan_version_test.py index 74857f724b8..d4904a2a1f7 100644 --- a/test/integration/conanfile/required_conan_version_test.py +++ b/test/integration/conanfile/required_conan_version_test.py @@ -3,7 +3,7 @@ import mock from conans import __version__ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_required_conan_version(): diff --git a/test/integration/conanfile/same_userchannel_test.py b/test/integration/conanfile/same_userchannel_test.py index c6795aba290..61851655b38 100644 --- a/test/integration/conanfile/same_userchannel_test.py +++ b/test/integration/conanfile/same_userchannel_test.py @@ -1,7 +1,7 @@ import unittest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class UserChannelTestPackage(unittest.TestCase): diff --git a/test/integration/conanfile/set_name_version_test.py b/test/integration/conanfile/set_name_version_test.py index 51209f3f0fd..3d5e8c7fda9 100644 --- a/test/integration/conanfile/set_name_version_test.py +++ b/test/integration/conanfile/set_name_version_test.py @@ -4,8 +4,8 @@ from parameterized import parameterized -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID from conans.util.files import mkdir diff --git a/test/integration/conanfile/test_attributes_scope.py b/test/integration/conanfile/test_attributes_scope.py index a8637ee1048..98d0ae65406 100644 --- a/test/integration/conanfile/test_attributes_scope.py +++ b/test/integration/conanfile/test_attributes_scope.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestAttributesScope: diff --git a/test/integration/conanfile/test_conanfile_txt_encodings.py b/test/integration/conanfile/test_conanfile_txt_encodings.py index cf8d7b07890..f838501fce4 100644 --- a/test/integration/conanfile/test_conanfile_txt_encodings.py +++ b/test/integration/conanfile/test_conanfile_txt_encodings.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestEncodings: diff --git a/test/integration/conanfile/test_conanfile_txt_test_requires.py b/test/integration/conanfile/test_conanfile_txt_test_requires.py index 3e1e5c7c3c6..4ec41d1c88b 100644 --- a/test/integration/conanfile/test_conanfile_txt_test_requires.py +++ b/test/integration/conanfile/test_conanfile_txt_test_requires.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_test_requires(): diff --git a/test/integration/conanfile/test_cpp_info_serialize.py b/test/integration/conanfile/test_cpp_info_serialize.py index 9daadf7d283..9905d91f6ca 100644 --- a/test/integration/conanfile/test_cpp_info_serialize.py +++ b/test/integration/conanfile/test_cpp_info_serialize.py @@ -1,7 +1,7 @@ import json import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_cpp_info_serialize_round_trip(): diff --git a/test/integration/conanfile/test_deploy_method.py b/test/integration/conanfile/test_deploy_method.py index 1c8a3f1bada..88da0f653cb 100644 --- a/test/integration/conanfile/test_deploy_method.py +++ b/test/integration/conanfile/test_deploy_method.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_deploy_method(): diff --git a/test/integration/conanfile/test_exception_printing.py b/test/integration/conanfile/test_exception_printing.py index 0bf2e063b3a..00f4be90d14 100644 --- a/test/integration/conanfile/test_exception_printing.py +++ b/test/integration/conanfile/test_exception_printing.py @@ -1,6 +1,6 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient conanfile = """ from conan import ConanFile diff --git a/test/integration/conanfile/test_print_in_conanfile.py b/test/integration/conanfile/test_print_in_conanfile.py index 64705e8e8c2..4a9271d05cc 100644 --- a/test/integration/conanfile/test_print_in_conanfile.py +++ b/test/integration/conanfile/test_print_in_conanfile.py @@ -1,7 +1,7 @@ import json import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_print_in_conanfile(): diff --git a/test/integration/conanfile/test_version_str.py b/test/integration/conanfile/test_version_str.py index a7fb4aeac23..41ce3ad7819 100644 --- a/test/integration/conanfile/test_version_str.py +++ b/test/integration/conanfile/test_version_str.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_conan_version_str(): diff --git a/test/integration/configuration/client_certs_test.py b/test/integration/configuration/client_certs_test.py index 60fe4b576dc..26c369c7a85 100644 --- a/test/integration/configuration/client_certs_test.py +++ b/test/integration/configuration/client_certs_test.py @@ -4,8 +4,8 @@ from requests import Response -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, TestRequester from conans.util.files import save diff --git a/test/integration/configuration/conf/test_conf.py b/test/integration/configuration/conf/test_conf.py index 25cc380755c..66cc9ef2219 100644 --- a/test/integration/configuration/conf/test_conf.py +++ b/test/integration/configuration/conf/test_conf.py @@ -7,10 +7,10 @@ from conan import conan_version from conan.internal.api import detect_api -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder from conans.util.files import save, load -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/configuration/conf/test_conf_from_br.py b/test/integration/configuration/conf/test_conf_from_br.py index 3108e853240..4b9aafe9ecd 100644 --- a/test/integration/configuration/conf/test_conf_from_br.py +++ b/test/integration/configuration/conf/test_conf_from_br.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_basic(): diff --git a/test/integration/configuration/conf/test_conf_package_id.py b/test/integration/configuration/conf/test_conf_package_id.py index f6bd137f620..66db4ff487c 100644 --- a/test/integration/configuration/conf/test_conf_package_id.py +++ b/test/integration/configuration/conf/test_conf_package_id.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/configuration/conf/test_conf_profile.py b/test/integration/configuration/conf/test_conf_profile.py index 8b3c8ac866b..e6f81fc657c 100644 --- a/test/integration/configuration/conf/test_conf_profile.py +++ b/test/integration/configuration/conf/test_conf_profile.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/configuration/custom_setting_test_package_test.py b/test/integration/configuration/custom_setting_test_package_test.py index c4088e7e98c..6c55e575457 100644 --- a/test/integration/configuration/custom_setting_test_package_test.py +++ b/test/integration/configuration/custom_setting_test_package_test.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/configuration/default_profile_test.py b/test/integration/configuration/default_profile_test.py index 6c862db9259..4b39c8e45f8 100644 --- a/test/integration/configuration/default_profile_test.py +++ b/test/integration/configuration/default_profile_test.py @@ -3,9 +3,9 @@ import unittest from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient from conans.util.env import environment_update from conans.util.files import save diff --git a/test/integration/configuration/invalid_settings_test.py b/test/integration/configuration/invalid_settings_test.py index f296986eab7..8d7d96c89b1 100644 --- a/test/integration/configuration/invalid_settings_test.py +++ b/test/integration/configuration/invalid_settings_test.py @@ -2,7 +2,7 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestSettingsLoad: diff --git a/test/integration/configuration/profile_test.py b/test/integration/configuration/profile_test.py index 92089f8d6f4..d47dba871a3 100644 --- a/test/integration/configuration/profile_test.py +++ b/test/integration/configuration/profile_test.py @@ -10,10 +10,10 @@ from parameterized import parameterized from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.profiles import create_profile as _create_profile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.profiles import create_profile as _create_profile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import load, save conanfile_scope_env = """ diff --git a/test/integration/configuration/proxies_conf_test.py b/test/integration/configuration/proxies_conf_test.py index 8a86ed987bd..7e2dd7e9a21 100644 --- a/test/integration/configuration/proxies_conf_test.py +++ b/test/integration/configuration/proxies_conf_test.py @@ -3,7 +3,7 @@ from requests import Response -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.utils.tools import TestClient, TestRequester from conans.util.env import environment_update from conans.util.files import save diff --git a/test/integration/configuration/python_version_test.py b/test/integration/configuration/python_version_test.py index 1aa963e9013..fd8e6f3379d 100644 --- a/test/integration/configuration/python_version_test.py +++ b/test/integration/configuration/python_version_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class PythonVersionTest(unittest.TestCase): diff --git a/test/integration/configuration/requester_test.py b/test/integration/configuration/requester_test.py index f460d2946c9..fe41b5bef9f 100644 --- a/test/integration/configuration/requester_test.py +++ b/test/integration/configuration/requester_test.py @@ -7,7 +7,7 @@ from conans import __version__ from conans.client.rest.conan_requester import ConanRequester from conans.model.conf import ConfDefinition -from conans.test.utils.tools import temp_folder +from conan.test.utils.tools import temp_folder from conans.util.files import save diff --git a/test/integration/configuration/required_version_test.py b/test/integration/configuration/required_version_test.py index 46e09fbafdf..d4a92fa1102 100644 --- a/test/integration/configuration/required_version_test.py +++ b/test/integration/configuration/required_version_test.py @@ -4,8 +4,8 @@ from conans import __version__ from conans.errors import ConanException -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/configuration/test_custom_symlinked_home.py b/test/integration/configuration/test_custom_symlinked_home.py index 133ebe9fed5..9113a014f25 100644 --- a/test/integration/configuration/test_custom_symlinked_home.py +++ b/test/integration/configuration/test_custom_symlinked_home.py @@ -3,9 +3,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID @pytest.mark.skipif(platform.system() == "Windows", reason="Uses symlinks") diff --git a/test/integration/configuration/test_profile_jinja.py b/test/integration/configuration/test_profile_jinja.py index 4972a523332..8a8e8d913c8 100644 --- a/test/integration/configuration/test_profile_jinja.py +++ b/test/integration/configuration/test_profile_jinja.py @@ -3,8 +3,8 @@ import os from conan import conan_version -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.env import environment_update diff --git a/test/integration/configuration/test_profile_plugin.py b/test/integration/configuration/test_profile_plugin.py index ae6c4dd85fb..a88eb0de7f3 100644 --- a/test/integration/configuration/test_profile_plugin.py +++ b/test/integration/configuration/test_profile_plugin.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/configuration/test_profile_priority.py b/test/integration/configuration/test_profile_priority.py index 4f2e73eae00..3a18ae74ff4 100644 --- a/test/integration/configuration/test_profile_priority.py +++ b/test/integration/configuration/test_profile_priority.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/cross_building/build_requires_from_profile_test.py b/test/integration/cross_building/build_requires_from_profile_test.py index b2fbba458af..32646e200ea 100644 --- a/test/integration/cross_building/build_requires_from_profile_test.py +++ b/test/integration/cross_building/build_requires_from_profile_test.py @@ -1,7 +1,7 @@ import unittest import textwrap -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class BuildRequiresFromProfileTest(unittest.TestCase): diff --git a/test/integration/cross_building/test_cross_build_options.py b/test/integration/cross_building/test_cross_build_options.py index 469be9c8bc5..2f06e36d8e1 100644 --- a/test/integration/cross_building/test_cross_build_options.py +++ b/test/integration/cross_building/test_cross_build_options.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_cross_build_options(): diff --git a/test/integration/cross_building/test_package_test.py b/test/integration/cross_building/test_package_test.py index be8be0496f8..6ffadac3e4e 100644 --- a/test/integration/cross_building/test_package_test.py +++ b/test/integration/cross_building/test_package_test.py @@ -3,7 +3,7 @@ from jinja2 import Template -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/deprecated/test_deprecated.py b/test/integration/deprecated/test_deprecated.py index acff0139f7b..fb42e790757 100644 --- a/test/integration/deprecated/test_deprecated.py +++ b/test/integration/deprecated/test_deprecated.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class TestDeprecated: diff --git a/test/integration/editable/editable_add_test.py b/test/integration/editable/editable_add_test.py index 5bbc19ad414..74621932f52 100644 --- a/test/integration/editable/editable_add_test.py +++ b/test/integration/editable/editable_add_test.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestEditablePackageTest: diff --git a/test/integration/editable/editable_remove_test.py b/test/integration/editable/editable_remove_test.py index 837e17601dc..c44213b0c49 100644 --- a/test/integration/editable/editable_remove_test.py +++ b/test/integration/editable/editable_remove_test.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestRemoveEditablePackageTest: diff --git a/test/integration/editable/forbidden_commands_test.py b/test/integration/editable/forbidden_commands_test.py index ca5b664f769..9941e4bb565 100644 --- a/test/integration/editable/forbidden_commands_test.py +++ b/test/integration/editable/forbidden_commands_test.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestOtherCommands: diff --git a/test/integration/editable/test_editable_envvars.py b/test/integration/editable/test_editable_envvars.py index bd7192f78d6..ac4223ade6b 100644 --- a/test/integration/editable/test_editable_envvars.py +++ b/test/integration/editable/test_editable_envvars.py @@ -2,8 +2,8 @@ import re import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_editable_envvars(): diff --git a/test/integration/editable/test_editable_import.py b/test/integration/editable/test_editable_import.py index b49af674834..30e1287ade6 100644 --- a/test/integration/editable/test_editable_import.py +++ b/test/integration/editable/test_editable_import.py @@ -2,7 +2,7 @@ import shutil import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestEditableImport: diff --git a/test/integration/editable/test_editable_layout.py b/test/integration/editable/test_editable_layout.py index 8cd7434349b..8c532139044 100644 --- a/test/integration/editable/test_editable_layout.py +++ b/test/integration/editable/test_editable_layout.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_editable_folders_root(): diff --git a/test/integration/editable/test_editable_ranges.py b/test/integration/editable/test_editable_ranges.py index 7b664ad96f3..3fb88a71496 100644 --- a/test/integration/editable/test_editable_ranges.py +++ b/test/integration/editable/test_editable_ranges.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_editable_ranges(): diff --git a/test/integration/editable/test_editables_layout.py b/test/integration/editable/test_editables_layout.py index 5f50a29958c..0d2ec719e0f 100644 --- a/test/integration/editable/test_editables_layout.py +++ b/test/integration/editable/test_editables_layout.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_cpp_info_editable(): diff --git a/test/integration/editable/transitive_editable_test.py b/test/integration/editable/transitive_editable_test.py index 6c7e54a13cc..96113b84dcf 100644 --- a/test/integration/editable/transitive_editable_test.py +++ b/test/integration/editable/transitive_editable_test.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile def test_transitive_editables_half_diamond(): diff --git a/test/integration/environment/test_buildenv_profile.py b/test/integration/environment/test_buildenv_profile.py index 530dc9d1a3d..546c688084b 100644 --- a/test/integration/environment/test_buildenv_profile.py +++ b/test/integration/environment/test_buildenv_profile.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/environment/test_env.py b/test/integration/environment/test_env.py index 49e5de986b6..031bb7dbc01 100644 --- a/test/integration/environment/test_env.py +++ b/test/integration/environment/test_env.py @@ -6,7 +6,7 @@ import pytest from conan.tools.env.environment import environment_wrap_command -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile @pytest.fixture() diff --git a/test/integration/environment/test_runenv_profile.py b/test/integration/environment/test_runenv_profile.py index d05b8f910c1..d5a3e8fb3fe 100644 --- a/test/integration/environment/test_runenv_profile.py +++ b/test/integration/environment/test_runenv_profile.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/export_sources_test.py b/test/integration/export_sources_test.py index d68850b3b65..a18defe3303 100644 --- a/test/integration/export_sources_test.py +++ b/test/integration/export_sources_test.py @@ -2,8 +2,8 @@ import textwrap from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_exports(): diff --git a/test/integration/extensions/test_cppstd_compat.py b/test/integration/extensions/test_cppstd_compat.py index 53f9f5d5743..d53bf0a8ef6 100644 --- a/test/integration/extensions/test_cppstd_compat.py +++ b/test/integration/extensions/test_cppstd_compat.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_compatible_cppstd(): diff --git a/test/integration/extensions/test_plugin_cmd_wrapper.py b/test/integration/extensions/test_plugin_cmd_wrapper.py index 5becbc1c183..bd2c1dd16bc 100644 --- a/test/integration/extensions/test_plugin_cmd_wrapper.py +++ b/test/integration/extensions/test_plugin_cmd_wrapper.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/extensions/test_profile_plugin.py b/test/integration/extensions/test_profile_plugin.py index b9b74dbf7d6..12b1590fc93 100644 --- a/test/integration/extensions/test_profile_plugin.py +++ b/test/integration/extensions/test_profile_plugin.py @@ -1,7 +1,7 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("compiler, version, cppstd, correct", [ diff --git a/test/integration/generators/generators_test.py b/test/integration/generators/generators_test.py index e74eb78e2ca..21d2c4b0a71 100644 --- a/test/integration/generators/generators_test.py +++ b/test/integration/generators/generators_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestGenerators: diff --git a/test/integration/generators/order_libs_test.py b/test/integration/generators/order_libs_test.py index e2c072ebb3e..cfd70079414 100644 --- a/test/integration/generators/order_libs_test.py +++ b/test/integration/generators/order_libs_test.py @@ -1,7 +1,7 @@ import platform -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_library_order(): diff --git a/test/integration/generators/test_custom_global_generators.py b/test/integration/generators/test_custom_global_generators.py index 6f8f926c639..d39e5e2fa19 100644 --- a/test/integration/generators/test_custom_global_generators.py +++ b/test/integration/generators/test_custom_global_generators.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/graph/conflict_diamond_test.py b/test/integration/graph/conflict_diamond_test.py index 6bd01301ff7..f0383157cac 100644 --- a/test/integration/graph/conflict_diamond_test.py +++ b/test/integration/graph/conflict_diamond_test.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestConflictDiamondTest: diff --git a/test/integration/graph/core/graph_manager_base.py b/test/integration/graph/core/graph_manager_base.py index a22e3245f8c..6ff38f269a4 100644 --- a/test/integration/graph/core/graph_manager_base.py +++ b/test/integration/graph/core/graph_manager_base.py @@ -14,8 +14,8 @@ from conans.model.profile import Profile from conans.model.recipe_ref import RecipeReference from conans.model.settings import Settings -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import GenConanfile from conans.util.dates import revision_timestamp_now from conans.util.files import save diff --git a/test/integration/graph/core/graph_manager_test.py b/test/integration/graph/core/graph_manager_test.py index c034da23132..290029814b5 100644 --- a/test/integration/graph/core/graph_manager_test.py +++ b/test/integration/graph/core/graph_manager_test.py @@ -3,8 +3,8 @@ from conans.client.graph.graph_error import GraphMissingError, GraphLoopError, GraphConflictError from conans.errors import ConanException -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.utils.tools import GenConanfile +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from conan.test.utils.tools import GenConanfile def _check_transitive(node, transitive_deps): diff --git a/test/integration/graph/core/test_alias.py b/test/integration/graph/core/test_alias.py index ebc5bef83fd..7be872ab702 100644 --- a/test/integration/graph/core/test_alias.py +++ b/test/integration/graph/core/test_alias.py @@ -1,7 +1,7 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.integration.graph.core.graph_manager_test import _check_transitive -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from test.integration.graph.core.graph_manager_test import _check_transitive +from conan.test.utils.tools import TestClient class TestAlias(GraphManagerTest): diff --git a/test/integration/graph/core/test_auto_package_type.py b/test/integration/graph/core/test_auto_package_type.py index bc29e294383..01db28fe8fd 100644 --- a/test/integration/graph/core/test_auto_package_type.py +++ b/test/integration/graph/core/test_auto_package_type.py @@ -1,6 +1,6 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient simple = """ from conan import ConanFile diff --git a/test/integration/graph/core/test_build_require_invalid.py b/test/integration/graph/core/test_build_require_invalid.py index f267e845333..b3e2520c971 100644 --- a/test/integration/graph/core/test_build_require_invalid.py +++ b/test/integration/graph/core/test_build_require_invalid.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID class TestInvalidConfiguration: diff --git a/test/integration/graph/core/test_build_requires.py b/test/integration/graph/core/test_build_requires.py index dbed116432e..a26948c0c90 100644 --- a/test/integration/graph/core/test_build_requires.py +++ b/test/integration/graph/core/test_build_requires.py @@ -6,8 +6,8 @@ from conans.client.graph.graph_error import GraphConflictError, GraphLoopError, GraphRuntimeError from conans.model.recipe_ref import RecipeReference -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.utils.tools import GenConanfile, NO_SETTINGS_PACKAGE_ID, TestClient +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from conan.test.utils.tools import GenConanfile, NO_SETTINGS_PACKAGE_ID, TestClient def _check_transitive(node, transitive_deps): diff --git a/test/integration/graph/core/test_options.py b/test/integration/graph/core/test_options.py index ca1f0d7c4ac..086e53be216 100644 --- a/test/integration/graph/core/test_options.py +++ b/test/integration/graph/core/test_options.py @@ -1,6 +1,6 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.integration.graph.core.graph_manager_test import _check_transitive +from conan.test.assets.genconanfile import GenConanfile +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from test.integration.graph.core.graph_manager_test import _check_transitive class TestOptions(GraphManagerTest): diff --git a/test/integration/graph/core/test_provides.py b/test/integration/graph/core/test_provides.py index 9b6a32b2972..aef4095b456 100644 --- a/test/integration/graph/core/test_provides.py +++ b/test/integration/graph/core/test_provides.py @@ -3,9 +3,9 @@ from parameterized import parameterized from conans.client.graph.graph_error import GraphProvidesError -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.integration.graph.core.graph_manager_test import _check_transitive -from conans.test.utils.tools import GenConanfile, TestClient +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from test.integration.graph.core.graph_manager_test import _check_transitive +from conan.test.utils.tools import GenConanfile, TestClient class TestProvidesTest(GraphManagerTest): diff --git a/test/integration/graph/core/test_version_ranges.py b/test/integration/graph/core/test_version_ranges.py index b9c91f3261b..17c0fef895e 100644 --- a/test/integration/graph/core/test_version_ranges.py +++ b/test/integration/graph/core/test_version_ranges.py @@ -3,9 +3,9 @@ from conan.api.model import Remote from conans.client.graph.graph_error import GraphConflictError, GraphMissingError -from conans.test.assets.genconanfile import GenConanfile -from conans.test.integration.graph.core.graph_manager_base import GraphManagerTest -from conans.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from test.integration.graph.core.graph_manager_base import GraphManagerTest +from conan.test.utils.tools import TestClient, TestServer, NO_SETTINGS_PACKAGE_ID class TestVersionRanges(GraphManagerTest): diff --git a/test/integration/graph/require_override_test.py b/test/integration/graph/require_override_test.py index 1b6941704fd..3dc677de3c7 100644 --- a/test/integration/graph/require_override_test.py +++ b/test/integration/graph/require_override_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class TestRequireOverride: diff --git a/test/integration/graph/test_dependencies_visit.py b/test/integration/graph/test_dependencies_visit.py index 6e0faa40380..718e1f06bf1 100644 --- a/test/integration/graph/test_dependencies_visit.py +++ b/test/integration/graph/test_dependencies_visit.py @@ -3,8 +3,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_dependencies_visit(): diff --git a/test/integration/graph/test_platform_requires.py b/test/integration/graph/test_platform_requires.py index 66f126aed91..5306da973ee 100644 --- a/test/integration/graph/test_platform_requires.py +++ b/test/integration/graph/test_platform_requires.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/graph/test_pure_runtime_dep.py b/test/integration/graph/test_pure_runtime_dep.py index d83c293c80d..f1b326f9e12 100644 --- a/test/integration/graph/test_pure_runtime_dep.py +++ b/test/integration/graph/test_pure_runtime_dep.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_pure_runtime_dep(): diff --git a/test/integration/graph/test_remote_resolution.py b/test/integration/graph/test_remote_resolution.py index 730c372d8de..7262bb3c775 100644 --- a/test/integration/graph/test_remote_resolution.py +++ b/test/integration/graph/test_remote_resolution.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_build_requires_ranges(): diff --git a/test/integration/graph/test_repackaging.py b/test/integration/graph/test_repackaging.py index 97386dbcc77..75a64c90681 100644 --- a/test/integration/graph/test_repackaging.py +++ b/test/integration/graph/test_repackaging.py @@ -1,8 +1,8 @@ import re import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_repackage(): diff --git a/test/integration/graph/test_replace_requires.py b/test/integration/graph/test_replace_requires.py index cd81a619027..4b4eb31ebb5 100644 --- a/test/integration/graph/test_replace_requires.py +++ b/test/integration/graph/test_replace_requires.py @@ -3,8 +3,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("require, pattern, alternative, pkg", [ diff --git a/test/integration/graph/test_require_same_pkg_versions.py b/test/integration/graph/test_require_same_pkg_versions.py index eb8a3df817a..6203f55b7cf 100644 --- a/test/integration/graph/test_require_same_pkg_versions.py +++ b/test/integration/graph/test_require_same_pkg_versions.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_require_different_versions(): diff --git a/test/integration/graph/test_skip_binaries.py b/test/integration/graph/test_skip_binaries.py index 317c08e2456..6155d68a901 100644 --- a/test/integration/graph/test_skip_binaries.py +++ b/test/integration/graph/test_skip_binaries.py @@ -1,7 +1,7 @@ import re -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID def test_private_skip(): diff --git a/test/integration/graph/test_system_tools.py b/test/integration/graph/test_system_tools.py index 36e9c2d8f1f..9db30ade76a 100644 --- a/test/integration/graph/test_system_tools.py +++ b/test/integration/graph/test_system_tools.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/graph/test_test_requires.py b/test/integration/graph/test_test_requires.py index 1f385f4ea74..f85391d9df5 100644 --- a/test/integration/graph/test_test_requires.py +++ b/test/integration/graph/test_test_requires.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestTestRequiresDiamond: diff --git a/test/integration/graph/test_validate_build.py b/test/integration/graph/test_validate_build.py index 5056c915607..c05a68db26b 100644 --- a/test/integration/graph/test_validate_build.py +++ b/test/integration/graph/test_validate_build.py @@ -1,8 +1,8 @@ import json import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_basic_validate_build_test(): diff --git a/test/integration/graph/ux/loop_detection_test.py b/test/integration/graph/ux/loop_detection_test.py index 8d3fb5f7b58..9f056ecf2a7 100644 --- a/test/integration/graph/ux/loop_detection_test.py +++ b/test/integration/graph/ux/loop_detection_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class LoopDetectionTest(unittest.TestCase): diff --git a/test/integration/graph/version_ranges/test_version_range_conf.py b/test/integration/graph/version_ranges/test_version_range_conf.py index 8301e4db9e3..29a350f87d9 100644 --- a/test/integration/graph/version_ranges/test_version_range_conf.py +++ b/test/integration/graph/version_ranges/test_version_range_conf.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_version_range_conf_nonexplicit_expression(): diff --git a/test/integration/graph/version_ranges/version_range_override_test.py b/test/integration/graph/version_ranges/version_range_override_test.py index 280abca7c10..171e306723b 100644 --- a/test/integration/graph/version_ranges/version_range_override_test.py +++ b/test/integration/graph/version_ranges/version_range_override_test.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class TestVersionRangeOverride: diff --git a/test/integration/graph/version_ranges/version_ranges_cached_test.py b/test/integration/graph/version_ranges/version_ranges_cached_test.py index 2f939fb99f3..8466c0cfd0f 100644 --- a/test/integration/graph/version_ranges/version_ranges_cached_test.py +++ b/test/integration/graph/version_ranges/version_ranges_cached_test.py @@ -5,8 +5,8 @@ from conans.client.remote_manager import RemoteManager from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer class TestVersionRangesCache: diff --git a/test/integration/graph/version_ranges/version_ranges_diamond_test.py b/test/integration/graph/version_ranges/version_ranges_diamond_test.py index 77d9e259bbe..748ff899196 100644 --- a/test/integration/graph/version_ranges/version_ranges_diamond_test.py +++ b/test/integration/graph/version_ranges/version_ranges_diamond_test.py @@ -1,7 +1,7 @@ from collections import OrderedDict -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer class TestVersionRangesUpdatingTest: diff --git a/test/integration/hooks/hook_test.py b/test/integration/hooks/hook_test.py index 6b88f4ecf21..87653397f1f 100644 --- a/test/integration/hooks/hook_test.py +++ b/test/integration/hooks/hook_test.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/hooks/test_post_export.py b/test/integration/hooks/test_post_export.py index bc65421fc98..958fff644e8 100644 --- a/test/integration/hooks/test_post_export.py +++ b/test/integration/hooks/test_post_export.py @@ -2,8 +2,8 @@ import textwrap from conans.model.manifest import FileTreeManifest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/hooks/test_post_package.py b/test/integration/hooks/test_post_package.py index 84b51548e4a..cafdf54033b 100644 --- a/test/integration/hooks/test_post_package.py +++ b/test/integration/hooks/test_post_package.py @@ -2,8 +2,8 @@ import textwrap from conans.model.manifest import FileTreeManifest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/layout/export_folder_variable_test.py b/test/integration/layout/export_folder_variable_test.py index 12c4a1469b0..2e9d13d5c25 100644 --- a/test/integration/layout/export_folder_variable_test.py +++ b/test/integration/layout/export_folder_variable_test.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestExportFoldersAvailability: diff --git a/test/integration/layout/test_cmake_build_folder.py b/test/integration/layout/test_cmake_build_folder.py index afdbfff99b0..c89b8b7bbb1 100644 --- a/test/integration/layout/test_cmake_build_folder.py +++ b/test/integration/layout/test_cmake_build_folder.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("cmd", ["install", "build"]) diff --git a/test/integration/layout/test_layout_generate.py b/test/integration/layout/test_layout_generate.py index 0fdbbe8ef46..26ed44f379e 100644 --- a/test/integration/layout/test_layout_generate.py +++ b/test/integration/layout/test_layout_generate.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_layout_generate(): diff --git a/test/integration/layout/test_layout_paths.py b/test/integration/layout/test_layout_paths.py index 1d1a59aa2ea..cc3877e421d 100644 --- a/test/integration/layout/test_layout_paths.py +++ b/test/integration/layout/test_layout_paths.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_editable_layout_paths(): diff --git a/test/integration/layout/test_legacy_cpp_info_and_layout.py b/test/integration/layout/test_legacy_cpp_info_and_layout.py index 931b6292913..167b4e02b79 100644 --- a/test/integration/layout/test_legacy_cpp_info_and_layout.py +++ b/test/integration/layout/test_legacy_cpp_info_and_layout.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient # TODO: This test does not make sense for Conan v2. Please, remove/skip it in that case. diff --git a/test/integration/lockfile/test_ci.py b/test/integration/lockfile/test_ci.py index 31f3fc9cabf..494d8a5b75d 100644 --- a/test/integration/lockfile/test_ci.py +++ b/test/integration/lockfile/test_ci.py @@ -4,8 +4,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient conanfile = textwrap.dedent(""" diff --git a/test/integration/lockfile/test_ci_overrides.py b/test/integration/lockfile/test_ci_overrides.py index e587988df7c..d8dc41a01b3 100644 --- a/test/integration/lockfile/test_ci_overrides.py +++ b/test/integration/lockfile/test_ci_overrides.py @@ -3,8 +3,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_graph_build_order_override_error(): diff --git a/test/integration/lockfile/test_ci_revisions.py b/test/integration/lockfile/test_ci_revisions.py index 5e5b2bf1568..bd0b9aa3b7d 100644 --- a/test/integration/lockfile/test_ci_revisions.py +++ b/test/integration/lockfile/test_ci_revisions.py @@ -4,7 +4,7 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient conanfile = textwrap.dedent(""" from conan import ConanFile diff --git a/test/integration/lockfile/test_compatibility.py b/test/integration/lockfile/test_compatibility.py index 890612b94a5..4c52ca72d58 100644 --- a/test/integration/lockfile/test_compatibility.py +++ b/test/integration/lockfile/test_compatibility.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_lockfile_compatibility(): diff --git a/test/integration/lockfile/test_graph_overrides.py b/test/integration/lockfile/test_graph_overrides.py index 4c42a9c67ea..1b6af57d2aa 100644 --- a/test/integration/lockfile/test_graph_overrides.py +++ b/test/integration/lockfile/test_graph_overrides.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("override, force", [(True, False), (False, True)]) diff --git a/test/integration/lockfile/test_lock_alias.py b/test/integration/lockfile/test_lock_alias.py index fc03b5f31ac..2c07cdb7d48 100644 --- a/test/integration/lockfile/test_lock_alias.py +++ b/test/integration/lockfile/test_lock_alias.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("requires", ["requires", "tool_requires"]) diff --git a/test/integration/lockfile/test_lock_build_requires.py b/test/integration/lockfile/test_lock_build_requires.py index a2cf3b76db1..b747699c92c 100644 --- a/test/integration/lockfile/test_lock_build_requires.py +++ b/test/integration/lockfile/test_lock_build_requires.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_lock_build_tool_requires(): diff --git a/test/integration/lockfile/test_lock_merge.py b/test/integration/lockfile/test_lock_merge.py index 261ed33aacf..410ce7977ca 100644 --- a/test/integration/lockfile/test_lock_merge.py +++ b/test/integration/lockfile/test_lock_merge.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("requires", ["requires", "tool_requires"]) diff --git a/test/integration/lockfile/test_lock_packages.py b/test/integration/lockfile/test_lock_packages.py index ae3f613dc40..f2847c8e7d2 100644 --- a/test/integration/lockfile/test_lock_packages.py +++ b/test/integration/lockfile/test_lock_packages.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID from conans.util.env import environment_update diff --git a/test/integration/lockfile/test_lock_pyrequires.py b/test/integration/lockfile/test_lock_pyrequires.py index dc53453ac27..6bb07a87a92 100644 --- a/test/integration/lockfile/test_lock_pyrequires.py +++ b/test/integration/lockfile/test_lock_pyrequires.py @@ -2,8 +2,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import load diff --git a/test/integration/lockfile/test_lock_pyrequires_revisions.py b/test/integration/lockfile/test_lock_pyrequires_revisions.py index c78f9f94325..06d2cf0251c 100644 --- a/test/integration/lockfile/test_lock_pyrequires_revisions.py +++ b/test/integration/lockfile/test_lock_pyrequires_revisions.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_transitive_py_requires_revisions(): diff --git a/test/integration/lockfile/test_lock_requires.py b/test/integration/lockfile/test_lock_requires.py index 5fe8b5922b5..59736952b63 100644 --- a/test/integration/lockfile/test_lock_requires.py +++ b/test/integration/lockfile/test_lock_requires.py @@ -6,8 +6,8 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("requires", ["requires", "tool_requires"]) diff --git a/test/integration/lockfile/test_lock_requires_revisions.py b/test/integration/lockfile/test_lock_requires_revisions.py index 1f6e16ab7ad..d6a181389b1 100644 --- a/test/integration/lockfile/test_lock_requires_revisions.py +++ b/test/integration/lockfile/test_lock_requires_revisions.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("requires", ["requires", "tool_requires"]) diff --git a/test/integration/lockfile/test_options.py b/test/integration/lockfile/test_options.py index 8cfda937fbd..05badfcb0ba 100644 --- a/test/integration/lockfile/test_options.py +++ b/test/integration/lockfile/test_options.py @@ -1,7 +1,7 @@ import json import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_options(): diff --git a/test/integration/lockfile/test_user_overrides.py b/test/integration/lockfile/test_user_overrides.py index b861b1233d8..2f3c3c32523 100644 --- a/test/integration/lockfile/test_user_overrides.py +++ b/test/integration/lockfile/test_user_overrides.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_user_overrides(): diff --git a/test/integration/metadata/test_metadata_collect.py b/test/integration/metadata/test_metadata_collect.py index ab74eafc983..f4674451116 100644 --- a/test/integration/metadata/test_metadata_collect.py +++ b/test/integration/metadata/test_metadata_collect.py @@ -2,8 +2,8 @@ import shutil import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/metadata/test_metadata_commands.py b/test/integration/metadata/test_metadata_commands.py index 6d3d405260f..097ac4c4247 100644 --- a/test/integration/metadata/test_metadata_commands.py +++ b/test/integration/metadata/test_metadata_commands.py @@ -1,9 +1,9 @@ import os import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID from conans.util.files import save, load diff --git a/test/integration/metadata/test_metadata_deploy.py b/test/integration/metadata/test_metadata_deploy.py index a40642577d9..ab6216568ab 100644 --- a/test/integration/metadata/test_metadata_deploy.py +++ b/test/integration/metadata/test_metadata_deploy.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient, TestServer +from conan.test.utils.tools import TestClient, TestServer class TestMetadataDeploy: diff --git a/test/integration/metadata/test_metadata_logs.py b/test/integration/metadata/test_metadata_logs.py index 1371ed16fbb..6de26128cb2 100644 --- a/test/integration/metadata/test_metadata_logs.py +++ b/test/integration/metadata/test_metadata_logs.py @@ -4,7 +4,7 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import load, save diff --git a/test/integration/metadata/test_metadata_test_package.py b/test/integration/metadata/test_metadata_test_package.py index 25f051ca489..cd6c10390e9 100644 --- a/test/integration/metadata/test_metadata_test_package.py +++ b/test/integration/metadata/test_metadata_test_package.py @@ -2,8 +2,8 @@ import shutil import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/options/options_in_requirements_test.py b/test/integration/options/options_in_requirements_test.py index fa2ef08ec55..c0d52a35311 100644 --- a/test/integration/options/options_in_requirements_test.py +++ b/test/integration/options/options_in_requirements_test.py @@ -2,7 +2,7 @@ import unittest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ChangeOptionsInRequirementsTest(unittest.TestCase): diff --git a/test/integration/options/options_test.py b/test/integration/options/options_test.py index fcc8257652c..8aedbbfb163 100644 --- a/test/integration/options/options_test.py +++ b/test/integration/options/options_test.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class OptionsTest(unittest.TestCase): diff --git a/test/integration/options/test_configure_options.py b/test/integration/options/test_configure_options.py index 5bfff4b95b8..1aff0e4d95b 100644 --- a/test/integration/options/test_configure_options.py +++ b/test/integration/options/test_configure_options.py @@ -3,7 +3,7 @@ from parameterized import parameterized -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ConfigureOptionsTest(unittest.TestCase): diff --git a/test/integration/options/test_options_build_requires.py b/test/integration/options/test_options_build_requires.py index 5350c24c96d..483d02fad82 100644 --- a/test/integration/options/test_options_build_requires.py +++ b/test/integration/options/test_options_build_requires.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_build_requires_options_different(): diff --git a/test/integration/options/test_package_config_test.py b/test/integration/options/test_package_config_test.py index 4713e64fed9..30c8ba85530 100644 --- a/test/integration/options/test_package_config_test.py +++ b/test/integration/options/test_package_config_test.py @@ -1,6 +1,6 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient test_conanfile = """from conan import ConanFile diff --git a/test/integration/package_id/build_id_test.py b/test/integration/package_id/build_id_test.py index 4cf358e5880..43a3357c934 100644 --- a/test/integration/package_id/build_id_test.py +++ b/test/integration/package_id/build_id_test.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient conanfile = """import os from conan import ConanFile diff --git a/test/integration/package_id/compatible_test.py b/test/integration/package_id/compatible_test.py index 8e4e0a99958..dca4e3c063a 100644 --- a/test/integration/package_id/compatible_test.py +++ b/test/integration/package_id/compatible_test.py @@ -1,7 +1,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save diff --git a/test/integration/package_id/full_revision_mode_test.py b/test/integration/package_id/full_revision_mode_test.py index 104c084c60b..18edf920209 100644 --- a/test/integration/package_id/full_revision_mode_test.py +++ b/test/integration/package_id/full_revision_mode_test.py @@ -3,7 +3,7 @@ from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save diff --git a/test/integration/package_id/package_id_and_confs_test.py b/test/integration/package_id/package_id_and_confs_test.py index f076490dc14..106a0346029 100644 --- a/test/integration/package_id/package_id_and_confs_test.py +++ b/test/integration/package_id/package_id_and_confs_test.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import GenConanfile, TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.utils.tools import GenConanfile, TestClient, NO_SETTINGS_PACKAGE_ID PKG_ID_NO_CONF = "ebec3dc6d7f6b907b3ada0c3d3cdc83613a2b715" PKG_ID_1 = "89d32f25195a77f4ae2e77414b870781853bdbc1" diff --git a/test/integration/package_id/package_id_modes_test.py b/test/integration/package_id/package_id_modes_test.py index f8555058658..70aa92d6539 100644 --- a/test/integration/package_id/package_id_modes_test.py +++ b/test/integration/package_id/package_id_modes_test.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import GenConanfile, TestClient +from conan.test.utils.tools import GenConanfile, TestClient def test_basic_default_modes_unknown(): diff --git a/test/integration/package_id/package_id_requires_modes_test.py b/test/integration/package_id/package_id_requires_modes_test.py index 3fecb42ce52..30628834e64 100644 --- a/test/integration/package_id/package_id_requires_modes_test.py +++ b/test/integration/package_id/package_id_requires_modes_test.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class TestPackageIDRequirementsModes: diff --git a/test/integration/package_id/package_id_test.py b/test/integration/package_id/package_id_test.py index 4acd4516c73..6426025d226 100644 --- a/test/integration/package_id/package_id_test.py +++ b/test/integration/package_id/package_id_test.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient from conans.util.files import save diff --git a/test/integration/package_id/python_requires_package_id_test.py b/test/integration/package_id/python_requires_package_id_test.py index b5cc478ca35..790ace7b8d1 100644 --- a/test/integration/package_id/python_requires_package_id_test.py +++ b/test/integration/package_id/python_requires_package_id_test.py @@ -1,7 +1,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save diff --git a/test/integration/package_id/test_cache_compatibles.py b/test/integration/package_id/test_cache_compatibles.py index 702b11e6d90..1a9952f51da 100644 --- a/test/integration/package_id/test_cache_compatibles.py +++ b/test/integration/package_id/test_cache_compatibles.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save diff --git a/test/integration/package_id/test_config_package_id.py b/test/integration/package_id/test_config_package_id.py index 1dfcb7953d1..34ba059400e 100644 --- a/test/integration/package_id/test_config_package_id.py +++ b/test/integration/package_id/test_config_package_id.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/package_id/test_default_package_id.py b/test/integration/package_id/test_default_package_id.py index 879befe242c..4bf829fe35c 100644 --- a/test/integration/package_id/test_default_package_id.py +++ b/test/integration/package_id/test_default_package_id.py @@ -1,7 +1,7 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("typedep, typeconsumer, different_id", diff --git a/test/integration/package_id/test_package_id_test_requires.py b/test/integration/package_id/test_package_id_test_requires.py index ff5703e621b..469582cde40 100644 --- a/test/integration/package_id/test_package_id_test_requires.py +++ b/test/integration/package_id/test_package_id_test_requires.py @@ -1,6 +1,6 @@ import pytest -from conans.test.utils.tools import GenConanfile, TestClient +from conan.test.utils.tools import GenConanfile, TestClient from conans.util.files import save diff --git a/test/integration/package_id/test_valid_package_id_values.py b/test/integration/package_id/test_valid_package_id_values.py index 84787d9136d..857e741dc24 100644 --- a/test/integration/package_id/test_valid_package_id_values.py +++ b/test/integration/package_id/test_valid_package_id_values.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestValidPackageIdValue: diff --git a/test/integration/package_id/test_validate.py b/test/integration/package_id/test_validate.py index 52de8cdcfa4..8cdb2cf8752 100644 --- a/test/integration/package_id/test_validate.py +++ b/test/integration/package_id/test_validate.py @@ -8,9 +8,9 @@ from conan.cli.exit_codes import ERROR_INVALID_CONFIGURATION, ERROR_GENERAL from conans.client.graph.graph import BINARY_INVALID -from conans.test.assets.genconanfile import GenConanfile +from conan.test.assets.genconanfile import GenConanfile from conans.util.files import save -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID class TestValidate(unittest.TestCase): diff --git a/test/integration/package_id/transitive_header_only_test.py b/test/integration/package_id/transitive_header_only_test.py index 4a88b9030db..7413345d13b 100644 --- a/test/integration/package_id/transitive_header_only_test.py +++ b/test/integration/package_id/transitive_header_only_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile from conans.util.files import save diff --git a/test/integration/package_id/transitive_options_affect_id_test.py b/test/integration/package_id/transitive_options_affect_id_test.py index e920869ac73..8b73a20172d 100644 --- a/test/integration/package_id/transitive_options_affect_id_test.py +++ b/test/integration/package_id/transitive_options_affect_id_test.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient class TestTransitiveOptionsAffectPackageID: diff --git a/test/integration/py_requires/python_requires_test.py b/test/integration/py_requires/python_requires_test.py index 68cb2d1ee32..007ed086dfb 100644 --- a/test/integration/py_requires/python_requires_test.py +++ b/test/integration/py_requires/python_requires_test.py @@ -4,7 +4,7 @@ import unittest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class PyRequiresExtendTest(unittest.TestCase): diff --git a/test/integration/remote/auth_bearer_test.py b/test/integration/remote/auth_bearer_test.py index 4e5eef9f91e..b5d05e531fa 100644 --- a/test/integration/remote/auth_bearer_test.py +++ b/test/integration/remote/auth_bearer_test.py @@ -2,7 +2,7 @@ from bottle import request -from conans.test.utils.tools import TestClient, TestServer +from conan.test.utils.tools import TestClient, TestServer conanfile = """ diff --git a/test/integration/remote/auth_test.py b/test/integration/remote/auth_test.py index cd1b9df6a07..d5cdd233372 100644 --- a/test/integration/remote/auth_test.py +++ b/test/integration/remote/auth_test.py @@ -9,11 +9,11 @@ from conans.errors import AuthenticationException from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient -from conans.test.utils.tools import TestRequester -from conans.test.utils.tools import TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient +from conan.test.utils.tools import TestRequester +from conan.test.utils.tools import TestServer from conans.util.env import environment_update from conans.util.files import save diff --git a/test/integration/remote/broken_download_test.py b/test/integration/remote/broken_download_test.py index 65a8afdd9e5..e9af846c46a 100644 --- a/test/integration/remote/broken_download_test.py +++ b/test/integration/remote/broken_download_test.py @@ -6,8 +6,8 @@ from requests.exceptions import ConnectionError -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestRequester, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestRequester, TestServer from conans.util.files import save diff --git a/test/integration/remote/download_retries_test.py b/test/integration/remote/download_retries_test.py index 4368dcb3c58..6b5e5cadf14 100644 --- a/test/integration/remote/download_retries_test.py +++ b/test/integration/remote/download_retries_test.py @@ -1,8 +1,8 @@ import unittest from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer, TestRequester +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer, TestRequester class DownloadRetriesTest(unittest.TestCase): diff --git a/test/integration/remote/download_test.py b/test/integration/remote/download_test.py index 04b672c4e13..a1acf2bd73c 100644 --- a/test/integration/remote/download_test.py +++ b/test/integration/remote/download_test.py @@ -2,7 +2,7 @@ from requests import Response -from conans.test.utils.tools import TestClient, TestServer, TestRequester +from conan.test.utils.tools import TestClient, TestServer, TestRequester myconan1 = """ from conan import ConanFile diff --git a/test/integration/remote/multi_remote_checks_test.py b/test/integration/remote/multi_remote_checks_test.py index 61e837ca119..ea2ecfd7f02 100644 --- a/test/integration/remote/multi_remote_checks_test.py +++ b/test/integration/remote/multi_remote_checks_test.py @@ -1,8 +1,8 @@ import unittest from collections import OrderedDict -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer class RemoteChecksTest(unittest.TestCase): diff --git a/test/integration/remote/multi_remote_test.py b/test/integration/remote/multi_remote_test.py index 515ad32dd1c..91c21c53d1e 100644 --- a/test/integration/remote/multi_remote_test.py +++ b/test/integration/remote/multi_remote_test.py @@ -4,8 +4,8 @@ from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer class ExportsSourcesMissingTest(unittest.TestCase): diff --git a/test/integration/remote/requester_test.py b/test/integration/remote/requester_test.py index fb16744ba74..28c34515082 100644 --- a/test/integration/remote/requester_test.py +++ b/test/integration/remote/requester_test.py @@ -1,6 +1,6 @@ from requests import Response -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.utils.tools import TestClient, TestRequester conanfile = """ diff --git a/test/integration/remote/rest_api_test.py b/test/integration/remote/rest_api_test.py index 324a673e52c..9d9e81ae5ea 100644 --- a/test/integration/remote/rest_api_test.py +++ b/test/integration/remote/rest_api_test.py @@ -16,11 +16,11 @@ from conans.model.package_ref import PkgReference from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE, CONANINFO, CONAN_MANIFEST -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.mocks import LocalDBMock -from conans.test.utils.server_launcher import TestServerLauncher -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import get_free_port +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.mocks import LocalDBMock +from conan.test.utils.server_launcher import TestServerLauncher +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import get_free_port from conans.util.files import md5, save diff --git a/test/integration/remote/retry_test.py b/test/integration/remote/retry_test.py index e9829a7338d..e5cba085f25 100644 --- a/test/integration/remote/retry_test.py +++ b/test/integration/remote/retry_test.py @@ -6,9 +6,9 @@ from conans.client.rest.file_uploader import FileUploader from conans.errors import AuthenticationException, ForbiddenException -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output from conans.util.files import save diff --git a/test/integration/remote/selected_remotes_test.py b/test/integration/remote/selected_remotes_test.py index aceeebbe2b1..8191d0c44b5 100644 --- a/test/integration/remote/selected_remotes_test.py +++ b/test/integration/remote/selected_remotes_test.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer class TestSelectedRemotesInstall: diff --git a/test/integration/remote/server_error_test.py b/test/integration/remote/server_error_test.py index ffae9874613..d9868b273ec 100644 --- a/test/integration/remote/server_error_test.py +++ b/test/integration/remote/server_error_test.py @@ -1,7 +1,7 @@ import unittest from conans import REVISIONS -from conans.test.utils.tools import TestClient, TestServer, TestRequester +from conan.test.utils.tools import TestClient, TestServer, TestRequester from collections import namedtuple diff --git a/test/integration/remote/test_conaninfo_parsing.py b/test/integration/remote/test_conaninfo_parsing.py index c3833d11206..cba79a57905 100644 --- a/test/integration/remote/test_conaninfo_parsing.py +++ b/test/integration/remote/test_conaninfo_parsing.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.artifactory_ready diff --git a/test/integration/remote/test_local_recipes_index.py b/test/integration/remote/test_local_recipes_index.py index b53465f7028..e96dddce3d0 100644 --- a/test/integration/remote/test_local_recipes_index.py +++ b/test/integration/remote/test_local_recipes_index.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import mkdir, save, save_files diff --git a/test/integration/remote/test_offline.py b/test/integration/remote/test_offline.py index 4aa33e79ee7..454ade94c36 100644 --- a/test/integration/remote/test_offline.py +++ b/test/integration/remote/test_offline.py @@ -1,7 +1,7 @@ import re -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestRequester def test_offline(): diff --git a/test/integration/remote/test_remote_file_credentials.py b/test/integration/remote/test_remote_file_credentials.py index f1d25ba74a2..cb6574d02aa 100644 --- a/test/integration/remote/test_remote_file_credentials.py +++ b/test/integration/remote/test_remote_file_credentials.py @@ -3,8 +3,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestServer +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestServer from conans.util.files import save diff --git a/test/integration/remote/test_request_headers.py b/test/integration/remote/test_request_headers.py index 3e084302190..4314fa90935 100644 --- a/test/integration/remote/test_request_headers.py +++ b/test/integration/remote/test_request_headers.py @@ -1,5 +1,5 @@ -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient, TestRequester +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient, TestRequester class RequesterClass(TestRequester): diff --git a/test/integration/remote/token_refresh_test.py b/test/integration/remote/token_refresh_test.py index 7679d60b508..8bae5ab5909 100644 --- a/test/integration/remote/token_refresh_test.py +++ b/test/integration/remote/token_refresh_test.py @@ -7,8 +7,8 @@ from conans.client.rest.rest_client import RestApiClientFactory from conans.model.conf import ConfDefinition from conans.model.recipe_ref import RecipeReference -from conans.test.utils.mocks import LocalDBMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import LocalDBMock +from conan.test.utils.test_files import temp_folder common_headers = {"X-Conan-Server-Capabilities": "oauth_token,revisions", "Content-Type": "application/json"} diff --git a/test/integration/settings/built_type_setting_test.py b/test/integration/settings/built_type_setting_test.py index 211809e4581..ddfcb648876 100644 --- a/test/integration/settings/built_type_setting_test.py +++ b/test/integration/settings/built_type_setting_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class BuildTypeSettingTest(unittest.TestCase): diff --git a/test/integration/settings/per_package_settings_test.py b/test/integration/settings/per_package_settings_test.py index 1eacb36b7d9..4cf0d868746 100644 --- a/test/integration/settings/per_package_settings_test.py +++ b/test/integration/settings/per_package_settings_test.py @@ -2,7 +2,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient, GenConanfile +from conan.test.utils.tools import TestClient, GenConanfile class PerPackageSettingTest(unittest.TestCase): diff --git a/test/integration/settings/remove_subsetting_test.py b/test/integration/settings/remove_subsetting_test.py index b2e4794aa23..0b63c9976f7 100644 --- a/test/integration/settings/remove_subsetting_test.py +++ b/test/integration/settings/remove_subsetting_test.py @@ -2,7 +2,7 @@ import textwrap import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import mkdir diff --git a/test/integration/settings/settings_override_test.py b/test/integration/settings/settings_override_test.py index e8d8e6f5dad..c5c26f1c5d0 100644 --- a/test/integration/settings/settings_override_test.py +++ b/test/integration/settings/settings_override_test.py @@ -4,8 +4,8 @@ from conans.model.recipe_ref import RecipeReference from conans.paths import CONANINFO -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import load diff --git a/test/integration/settings/test_disable_settings_assignment.py b/test/integration/settings/test_disable_settings_assignment.py index 8cddc605d80..b263e210402 100644 --- a/test/integration/settings/test_disable_settings_assignment.py +++ b/test/integration/settings/test_disable_settings_assignment.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_disable_settings_assignment(): diff --git a/test/integration/settings/test_non_defining_settings.py b/test/integration/settings/test_non_defining_settings.py index 5fcbbbd78d8..5b68e15249a 100644 --- a/test/integration/settings/test_non_defining_settings.py +++ b/test/integration/settings/test_non_defining_settings.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_settings_not_defined_consuming(): diff --git a/test/integration/settings/test_settings_possible_values.py b/test/integration/settings/test_settings_possible_values.py index 26475500352..63eb9500438 100644 --- a/test/integration/settings/test_settings_possible_values.py +++ b/test/integration/settings/test_settings_possible_values.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_settings_definitions(): diff --git a/test/integration/settings/test_settings_user.py b/test/integration/settings/test_settings_user.py index 215aa794c50..0a5bf6be7c3 100644 --- a/test/integration/settings/test_settings_user.py +++ b/test/integration/settings/test_settings_user.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/symlinks/symlinks_test.py b/test/integration/symlinks/symlinks_test.py index 3d24dee2724..407f4c572b3 100644 --- a/test/integration/symlinks/symlinks_test.py +++ b/test/integration/symlinks/symlinks_test.py @@ -6,9 +6,9 @@ from conans.model.recipe_ref import RecipeReference from conans.paths import PACKAGE_TGZ_NAME -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, TestServer, TurboTestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, TestServer, TurboTestClient from conans.util.files import load, rmdir, chdir, save links_conanfile = textwrap.dedent(""" diff --git a/test/integration/sysroot_test.py b/test/integration/sysroot_test.py index 0f3ce61c3c4..c9279316ccc 100644 --- a/test/integration/sysroot_test.py +++ b/test/integration/sysroot_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class SysrootTest(unittest.TestCase): diff --git a/test/integration/system_reqs_test.py b/test/integration/system_reqs_test.py index 8c7a762356c..561deb24440 100644 --- a/test/integration/system_reqs_test.py +++ b/test/integration/system_reqs_test.py @@ -1,4 +1,4 @@ -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient base_conanfile = ''' from conan import ConanFile diff --git a/test/integration/test_components.py b/test/integration/test_components.py index e3934c89378..8074f2baec8 100644 --- a/test/integration/test_components.py +++ b/test/integration/test_components.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_components_cycles(): diff --git a/test/integration/test_components_error.py b/test/integration/test_components_error.py index 2e5818bd89f..07943ddd95d 100644 --- a/test/integration/test_components_error.py +++ b/test/integration/test_components_error.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_component_error(): diff --git a/test/integration/test_db_error.py b/test/integration/test_db_error.py index ff4894d341d..8ba205fac6e 100644 --- a/test/integration/test_db_error.py +++ b/test/integration/test_db_error.py @@ -1,8 +1,8 @@ import os import shutil -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_db_error(): diff --git a/test/integration/test_migrations.py b/test/integration/test_migrations.py index efa75434e5d..73fa759e0fe 100644 --- a/test/integration/test_migrations.py +++ b/test/integration/test_migrations.py @@ -5,9 +5,9 @@ import pytest from conan import conan_version -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save, load diff --git a/test/integration/test_package_python_files.py b/test/integration/test_package_python_files.py index 98df7cc3780..3b76cecd477 100644 --- a/test/integration/test_package_python_files.py +++ b/test/integration/test_package_python_files.py @@ -3,7 +3,7 @@ from conans.model.recipe_ref import RecipeReference from conans.util.files import load -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID def test_package_python_files(): diff --git a/test/integration/test_pkg_signing.py b/test/integration/test_pkg_signing.py index da6c34efec0..a0d3cbf693a 100644 --- a/test/integration/test_pkg_signing.py +++ b/test/integration/test_pkg_signing.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/test_source_download_password.py b/test/integration/test_source_download_password.py index eac0ef4db43..980c666aab1 100644 --- a/test/integration/test_source_download_password.py +++ b/test/integration/test_source_download_password.py @@ -3,8 +3,8 @@ import textwrap -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.tools import TestClient +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/integration/test_timestamp_error.py b/test/integration/test_timestamp_error.py index ec7cce14d97..6d18481b528 100644 --- a/test/integration/test_timestamp_error.py +++ b/test/integration/test_timestamp_error.py @@ -1,7 +1,7 @@ import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_timestamp_error(): diff --git a/test/integration/tgz_macos_dot_files_test.py b/test/integration/tgz_macos_dot_files_test.py index 9d4dfa58fb4..082a0ed8447 100644 --- a/test/integration/tgz_macos_dot_files_test.py +++ b/test/integration/tgz_macos_dot_files_test.py @@ -11,7 +11,7 @@ from conans.client.remote_manager import uncompress_file from conans.model.recipe_ref import RecipeReference from conans.paths import EXPORT_SOURCES_TGZ_NAME -from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID +from conan.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID @pytest.mark.skipif(platform.system() != "Darwin", reason="Requires OSX") diff --git a/test/integration/toolchains/apple/test_xcodedeps.py b/test/integration/toolchains/apple/test_xcodedeps.py index 7455fb5950d..070b5918d79 100644 --- a/test/integration/toolchains/apple/test_xcodedeps.py +++ b/test/integration/toolchains/apple/test_xcodedeps.py @@ -5,9 +5,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.integration.toolchains.apple.test_xcodetoolchain import _get_filename -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from test.integration.toolchains.apple.test_xcodetoolchain import _get_filename +from conan.test.utils.tools import TestClient _expected_dep_xconfig = [ "SYSTEM_HEADER_SEARCH_PATHS = $(inherited) $(SYSTEM_HEADER_SEARCH_PATHS_{name}_{name})", diff --git a/test/integration/toolchains/apple/test_xcodetoolchain.py b/test/integration/toolchains/apple/test_xcodetoolchain.py index 3453fca319a..a7e4bee8d04 100644 --- a/test/integration/toolchains/apple/test_xcodetoolchain.py +++ b/test/integration/toolchains/apple/test_xcodetoolchain.py @@ -2,7 +2,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def _get_filename(configuration, architecture, sdk_version): diff --git a/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py index 53dee803222..563f14069b7 100644 --- a/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py +++ b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py @@ -2,8 +2,8 @@ import platform import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_package_from_system(): diff --git a/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py index f5f261a9d6a..974311ac39f 100644 --- a/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py +++ b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py @@ -5,8 +5,8 @@ from conan.tools.cmake.cmakedeps.cmakedeps import FIND_MODE_CONFIG, FIND_MODE_MODULE, \ FIND_MODE_BOTH, FIND_MODE_NONE -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize("cmake_find_mode", [FIND_MODE_CONFIG, FIND_MODE_MODULE, diff --git a/test/integration/toolchains/cmake/test_cmake.py b/test/integration/toolchains/cmake/test_cmake.py index c49c1505624..47642b0e3bc 100644 --- a/test/integration/toolchains/cmake/test_cmake.py +++ b/test/integration/toolchains/cmake/test_cmake.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_configure_args(): diff --git a/test/integration/toolchains/cmake/test_cmaketoolchain.py b/test/integration/toolchains/cmake/test_cmaketoolchain.py index 25601b1dfa1..81ad493a1ef 100644 --- a/test/integration/toolchains/cmake/test_cmaketoolchain.py +++ b/test/integration/toolchains/cmake/test_cmaketoolchain.py @@ -8,8 +8,8 @@ from mock import mock from conan.tools.cmake.presets import load_cmake_presets -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import rmdir, load @@ -381,13 +381,13 @@ def test_runtime_lib_dirs_single_conf(lib_dir_setup): is_windows = platform.system() == "Windows" if is_windows: generator = '-c tools.cmake.cmaketoolchain:generator=Ninja' - + client.run(f'install . -s build_type=Release {generator}') contents = client.load("conan_toolchain.cmake") pattern_lib_path = r'list\(PREPEND CMAKE_LIBRARY_PATH (.*)\)' pattern_lib_dirs = r'set\(CONAN_RUNTIME_LIB_DIRS (.*) \)' - # On *nix platforms: the list in `CMAKE_LIBRARY_PATH` + # On *nix platforms: the list in `CMAKE_LIBRARY_PATH` # is the same as `CONAN_RUNTIME_LIB_DIRS` # On windows, it's the same but with `bin` instead of `lib` cmake_library_path = re.search(pattern_lib_path, contents).group(1) diff --git a/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py b/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py index b504bdcd386..e8e3a335fb2 100644 --- a/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py +++ b/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_custom_block(): diff --git a/test/integration/toolchains/env/test_buildenv.py b/test/integration/toolchains/env/test_buildenv.py index dd02905871e..34ea97f5127 100644 --- a/test/integration/toolchains/env/test_buildenv.py +++ b/test/integration/toolchains/env/test_buildenv.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Fails on windows") diff --git a/test/integration/toolchains/env/test_virtualenv_default_apply.py b/test/integration/toolchains/env/test_virtualenv_default_apply.py index d0911bd7108..4ee7deb6749 100644 --- a/test/integration/toolchains/env/test_virtualenv_default_apply.py +++ b/test/integration/toolchains/env/test_virtualenv_default_apply.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/toolchains/env/test_virtualenv_object_access.py b/test/integration/toolchains/env/test_virtualenv_object_access.py index 6a7ea3c74b0..ce023c3fb3d 100644 --- a/test/integration/toolchains/env/test_virtualenv_object_access.py +++ b/test/integration/toolchains/env/test_virtualenv_object_access.py @@ -2,8 +2,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.fixture diff --git a/test/integration/toolchains/env/test_virtualenv_winbash.py b/test/integration/toolchains/env/test_virtualenv_winbash.py index 1fe731c0f72..97acf9a9bff 100644 --- a/test/integration/toolchains/env/test_virtualenv_winbash.py +++ b/test/integration/toolchains/env/test_virtualenv_winbash.py @@ -4,9 +4,9 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.conftest import tools_locations -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from test.conftest import tools_locations +from conan.test.utils.tools import TestClient from conans.util.files import save """ diff --git a/test/integration/toolchains/gnu/test_autotoolsdeps.py b/test/integration/toolchains/gnu/test_autotoolsdeps.py index 6edbbba6971..fcd1cd3fd14 100644 --- a/test/integration/toolchains/gnu/test_autotoolsdeps.py +++ b/test/integration/toolchains/gnu/test_autotoolsdeps.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() not in ["Linux", "Darwin"], reason="Autotools") diff --git a/test/integration/toolchains/gnu/test_autotoolstoolchain.py b/test/integration/toolchains/gnu/test_autotoolstoolchain.py index e8c71a6e671..c80468a7110 100644 --- a/test/integration/toolchains/gnu/test_autotoolstoolchain.py +++ b/test/integration/toolchains/gnu/test_autotoolstoolchain.py @@ -2,8 +2,8 @@ import platform import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save, load diff --git a/test/integration/toolchains/gnu/test_basic_layout.py b/test/integration/toolchains/gnu/test_basic_layout.py index 19cd9ebb67e..dad7e73004c 100644 --- a/test/integration/toolchains/gnu/test_basic_layout.py +++ b/test/integration/toolchains/gnu/test_basic_layout.py @@ -2,7 +2,7 @@ import platform import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_basic_layout_subproject(): diff --git a/test/integration/toolchains/gnu/test_gnutoolchain.py b/test/integration/toolchains/gnu/test_gnutoolchain.py index 0541e238128..653599ae65a 100644 --- a/test/integration/toolchains/gnu/test_gnutoolchain.py +++ b/test/integration/toolchains/gnu/test_gnutoolchain.py @@ -5,8 +5,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import save, load diff --git a/test/integration/toolchains/gnu/test_makedeps.py b/test/integration/toolchains/gnu/test_makedeps.py index efbff9372f9..948174280b1 100644 --- a/test/integration/toolchains/gnu/test_makedeps.py +++ b/test/integration/toolchains/gnu/test_makedeps.py @@ -4,8 +4,8 @@ import textwrap import pathlib -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conan.tools.gnu.makedeps import CONAN_MAKEFILE_FILENAME diff --git a/test/integration/toolchains/gnu/test_pkgconfigdeps.py b/test/integration/toolchains/gnu/test_pkgconfigdeps.py index eacad94118c..29530e43129 100644 --- a/test/integration/toolchains/gnu/test_pkgconfigdeps.py +++ b/test/integration/toolchains/gnu/test_pkgconfigdeps.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient from conans.util.files import load diff --git a/test/integration/toolchains/google/test_bazeldeps.py b/test/integration/toolchains/google/test_bazeldeps.py index 92ccd008d7d..2eb9c971f8f 100644 --- a/test/integration/toolchains/google/test_bazeldeps.py +++ b/test/integration/toolchains/google/test_bazeldeps.py @@ -1,8 +1,8 @@ import os import textwrap -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_bazel(): diff --git a/test/integration/toolchains/google/test_bazeltoolchain.py b/test/integration/toolchains/google/test_bazeltoolchain.py index d18a489ea39..ce147376afa 100644 --- a/test/integration/toolchains/google/test_bazeltoolchain.py +++ b/test/integration/toolchains/google/test_bazeltoolchain.py @@ -5,7 +5,7 @@ from conan.tools.files import load from conan.tools.google import BazelToolchain -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.fixture(scope="module") diff --git a/test/integration/toolchains/intel/test_intel_cc.py b/test/integration/toolchains/intel/test_intel_cc.py index 13778cbc369..795ee1c094a 100644 --- a/test/integration/toolchains/intel/test_intel_cc.py +++ b/test/integration/toolchains/intel/test_intel_cc.py @@ -3,7 +3,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient conanfile = textwrap.dedent("""\ [generators] diff --git a/test/integration/toolchains/meson/test_mesontoolchain.py b/test/integration/toolchains/meson/test_mesontoolchain.py index 3f4f01643b8..b7a2742f774 100644 --- a/test/integration/toolchains/meson/test_mesontoolchain.py +++ b/test/integration/toolchains/meson/test_mesontoolchain.py @@ -4,10 +4,10 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile +from conan.test.assets.genconanfile import GenConanfile from conan.tools.files import load from conan.tools.meson import MesonToolchain -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_apple_meson_keep_user_custom_flags(): diff --git a/test/integration/toolchains/microsoft/test_msbuilddeps.py b/test/integration/toolchains/microsoft/test_msbuilddeps.py index 1b2cccb13b6..e27a382f944 100644 --- a/test/integration/toolchains/microsoft/test_msbuilddeps.py +++ b/test/integration/toolchains/microsoft/test_msbuilddeps.py @@ -5,8 +5,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.parametrize( diff --git a/test/integration/toolchains/microsoft/test_msbuildtoolchain.py b/test/integration/toolchains/microsoft/test_msbuildtoolchain.py index 8028c3b68dd..327e3ac1c01 100644 --- a/test/integration/toolchains/microsoft/test_msbuildtoolchain.py +++ b/test/integration/toolchains/microsoft/test_msbuildtoolchain.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_msbuildtoolchain_props_with_extra_flags(): diff --git a/test/integration/toolchains/microsoft/test_nmakedeps.py b/test/integration/toolchains/microsoft/test_nmakedeps.py index 3ac4233a153..39a93a107ac 100644 --- a/test/integration/toolchains/microsoft/test_nmakedeps.py +++ b/test/integration/toolchains/microsoft/test_nmakedeps.py @@ -4,7 +4,7 @@ import pytest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows") diff --git a/test/integration/toolchains/microsoft/test_vs_layout.py b/test/integration/toolchains/microsoft/test_vs_layout.py index 5a446da73a2..d406440cd58 100644 --- a/test/integration/toolchains/microsoft/test_vs_layout.py +++ b/test/integration/toolchains/microsoft/test_vs_layout.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_vs_layout_subproject(): diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py index dfee025d937..dfa7ed92a04 100644 --- a/test/integration/toolchains/microsoft/vcvars_test.py +++ b/test/integration/toolchains/microsoft/vcvars_test.py @@ -4,8 +4,8 @@ import pytest -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() not in ["Windows"], reason="Requires Windows") diff --git a/test/integration/toolchains/premake/test_premakedeps.py b/test/integration/toolchains/premake/test_premakedeps.py index 8a2c03c1e7e..5beafc197dd 100644 --- a/test/integration/toolchains/premake/test_premakedeps.py +++ b/test/integration/toolchains/premake/test_premakedeps.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def assert_vars_file(client, configuration): diff --git a/test/integration/toolchains/scons/test_scondeps.py b/test/integration/toolchains/scons/test_scondeps.py index 5e5fe9df7a3..a3ff84fd262 100644 --- a/test/integration/toolchains/scons/test_scondeps.py +++ b/test/integration/toolchains/scons/test_scondeps.py @@ -1,7 +1,7 @@ import re import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_sconsdeps(): diff --git a/test/integration/toolchains/test_raise_on_universal_binaries.py b/test/integration/toolchains/test_raise_on_universal_binaries.py index 552424a652a..b71e1bc0767 100644 --- a/test/integration/toolchains/test_raise_on_universal_binaries.py +++ b/test/integration/toolchains/test_raise_on_universal_binaries.py @@ -1,7 +1,7 @@ from parameterized import parameterized -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient @parameterized.expand(["AutotoolsToolchain", "MesonToolchain", "BazelToolchain"]) diff --git a/test/integration/toolchains/test_toolchain_namespaces.py b/test/integration/toolchains/test_toolchain_namespaces.py index b678f120595..06421490706 100644 --- a/test/integration/toolchains/test_toolchain_namespaces.py +++ b/test/integration/toolchains/test_toolchain_namespaces.py @@ -2,7 +2,7 @@ import textwrap from conan.tools.build import load_toolchain_args, CONAN_TOOLCHAIN_ARGS_FILE -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_autotools_namespace(): diff --git a/test/integration/tools/conan_version_test.py b/test/integration/tools/conan_version_test.py index c65be48dd10..740f3713995 100644 --- a/test/integration/tools/conan_version_test.py +++ b/test/integration/tools/conan_version_test.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans import __version__ diff --git a/test/integration/tools/cppstd_minimum_version_test.py b/test/integration/tools/cppstd_minimum_version_test.py index 3933b1646b0..241cb28989d 100644 --- a/test/integration/tools/cppstd_minimum_version_test.py +++ b/test/integration/tools/cppstd_minimum_version_test.py @@ -2,7 +2,7 @@ from parameterized import parameterized from textwrap import dedent -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class CppStdMinimumVersionTests(unittest.TestCase): diff --git a/test/integration/tools/cpu_count_test.py b/test/integration/tools/cpu_count_test.py index 5b88d5ffb0d..c831f6695a2 100644 --- a/test/integration/tools/cpu_count_test.py +++ b/test/integration/tools/cpu_count_test.py @@ -1,6 +1,6 @@ import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class TestNJobs: diff --git a/test/integration/tools/file_tools_test.py b/test/integration/tools/file_tools_test.py index b7d3b80b846..2073872d899 100644 --- a/test/integration/tools/file_tools_test.py +++ b/test/integration/tools/file_tools_test.py @@ -1,7 +1,7 @@ import os import textwrap -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient def test_file_tools(): diff --git a/test/integration/tools/fix_symlinks_test.py b/test/integration/tools/fix_symlinks_test.py index 0bfa9dd66da..e3e7fef4f23 100644 --- a/test/integration/tools/fix_symlinks_test.py +++ b/test/integration/tools/fix_symlinks_test.py @@ -6,7 +6,7 @@ import pytest from conans.model.recipe_ref import RecipeReference -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient @pytest.mark.skipif(platform.system() == "Windows", reason="symlink need admin privileges") diff --git a/test/integration/tools/system/package_manager_test.py b/test/integration/tools/system/package_manager_test.py index 6375a18c695..d4c04f31474 100644 --- a/test/integration/tools/system/package_manager_test.py +++ b/test/integration/tools/system/package_manager_test.py @@ -9,7 +9,7 @@ Zypper, PacMan, _SystemPackageManagerTool from conans.errors import ConanException from conans.model.settings import Settings -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.mark.parametrize("platform, tool", [ diff --git a/test/integration/tools/test_apple_xcrun.py b/test/integration/tools/test_apple_xcrun.py index 5e978106aed..c973143d0a4 100644 --- a/test/integration/tools/test_apple_xcrun.py +++ b/test/integration/tools/test_apple_xcrun.py @@ -4,7 +4,7 @@ import pytest from conan.tools.apple.apple import XCRun -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings from conans.util.runners import conan_run diff --git a/test/integration/ui/exit_with_code_test.py b/test/integration/ui/exit_with_code_test.py index 82d1e5d3cb4..a75297c90f4 100644 --- a/test/integration/ui/exit_with_code_test.py +++ b/test/integration/ui/exit_with_code_test.py @@ -1,7 +1,7 @@ import unittest from conans.paths import CONANFILE -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import save diff --git a/test/performance/test_large_graph.py b/test/performance/test_large_graph.py index a497c27ac69..7f5fe20b36e 100644 --- a/test/performance/test_large_graph.py +++ b/test/performance/test_large_graph.py @@ -4,8 +4,8 @@ import time from pstats import SortKey -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.tools import TestClient +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.tools import TestClient def test_large_graph(): diff --git a/test/unittests/cli/common_test.py b/test/unittests/cli/common_test.py index 79b30e70f19..47c4282521f 100644 --- a/test/unittests/cli/common_test.py +++ b/test/unittests/cli/common_test.py @@ -6,7 +6,7 @@ from conan.api.conan_api import ConanAPI from conan.internal.cache.home_paths import HomePaths from conans.errors import ConanException -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/client/build/__init__.py b/test/unittests/client/build/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/unittests/client/build/compiler_flags_test.py b/test/unittests/client/build/compiler_flags_test.py new file mode 100644 index 00000000000..e2c780835ed --- /dev/null +++ b/test/unittests/client/build/compiler_flags_test.py @@ -0,0 +1,106 @@ +import unittest +from parameterized.parameterized import parameterized + +from conan.tools.build.flags import architecture_flag, build_type_flags +from conan.test.utils.mocks import MockSettings + + +class CompilerFlagsTest(unittest.TestCase): + + @parameterized.expand([("gcc", "x86", None, "-m32"), + ("clang", "x86", None, "-m32"), + ("sun-cc", "x86", None, "-m32"), + ("gcc", "x86_64", None, "-m64"), + ("clang", "x86_64", None, "-m64"), + ("sun-cc", "x86_64", None, "-m64"), + ("sun-cc", "sparc", None, "-m32"), + ("sun-cc", "sparcv9", None, "-m64"), + ("gcc", "armv7", None, ""), + ("clang", "armv7", None, ""), + ("sun-cc", "armv7", None, ""), + ("gcc", "s390", None, "-m31"), + ("clang", "s390", None, "-m31"), + ("sun-cc", "s390", None, "-m31"), + ("gcc", "s390x", None, "-m64"), + ("clang", "s390x", None, "-m64"), + ("sun-cc", "s390x", None, "-m64"), + ("msvc", "x86", None, ""), + ("msvc", "x86_64", None, ""), + ("gcc", "ppc32", "AIX", "-maix32"), + ("gcc", "ppc64", "AIX", "-maix64"), + ]) + def test_arch_flag(self, compiler, arch, the_os, flag): + settings = MockSettings({"compiler": compiler, + "arch": arch, + "os": the_os}) + self.assertEqual(architecture_flag(settings), flag) + + def test_catalyst(self): + settings = MockSettings({"compiler": "apple-clang", + "arch": "x86_64", + "os": "Macos", + "os.subsystem": "catalyst", + "os.subsystem.ios_version": "13.1"}) + self.assertEqual(architecture_flag(settings), "--target=x86_64-apple-ios13.1-macabi") + + settings = MockSettings({"compiler": "apple-clang", + "arch": "armv8", + "os": "Macos", + "os.subsystem": "catalyst", + "os.subsystem.ios_version": "13.1"}) + self.assertEqual(architecture_flag(settings), "--target=arm64-apple-ios13.1-macabi") + + @parameterized.expand([("Linux", "x86", "-m32"), + ("Linux", "x86_64", "-m64"), + ("Windows", "x86", "/Qm32"), + ("Windows", "x86_64", "/Qm64"), + ]) + def test_arch_flag_intel(self, os_, arch, flag): + settings = MockSettings({"compiler": "intel-cc", + "os": os_, + "arch": arch}) + self.assertEqual(architecture_flag(settings), flag) + + @parameterized.expand([("e2k-v2", "-march=elbrus-v2"), + ("e2k-v3", "-march=elbrus-v3"), + ("e2k-v4", "-march=elbrus-v4"), + ("e2k-v5", "-march=elbrus-v5"), + ("e2k-v6", "-march=elbrus-v6"), + ("e2k-v7", "-march=elbrus-v7"), + ]) + def test_arch_flag_mcst_lcc(self, arch, flag): + settings = MockSettings({"compiler": "mcst-lcc", + "arch": arch}) + self.assertEqual(architecture_flag(settings), flag) + + @parameterized.expand([("msvc", "Debug", None, "-Zi -Ob0 -Od"), + ("msvc", "Release", None, "-O2 -Ob2"), + ("msvc", "RelWithDebInfo", None, "-Zi -O2 -Ob1"), + ("msvc", "MinSizeRel", None, "-O1 -Ob1"), + ("msvc", "Debug", "v140_clang_c2", "-gline-tables-only -fno-inline -O0"), + ("msvc", "Release", "v140_clang_c2", "-O2"), + ("msvc", "RelWithDebInfo", "v140_clang_c2", "-gline-tables-only -O2 -fno-inline"), + ("msvc", "MinSizeRel", "v140_clang_c2", ""), + ("gcc", "Debug", None, "-g"), + ("gcc", "Release", None, "-O3"), + ("gcc", "RelWithDebInfo", None, "-O2 -g"), + ("gcc", "MinSizeRel", None, "-Os"), + ("clang", "Debug", None, "-g"), + ("clang", "Release", None, "-O3"), + ("clang", "RelWithDebInfo", None, "-O2 -g"), + ("clang", "MinSizeRel", None, "-Os"), + ("apple-clang", "Debug", None, "-g"), + ("apple-clang", "Release", None, "-O3"), + ("apple-clang", "RelWithDebInfo", None, "-O2 -g"), + ("apple-clang", "MinSizeRel", None, "-Os"), + ("sun-cc", "Debug", None, "-g"), + ("sun-cc", "Release", None, "-xO3"), + ("sun-cc", "RelWithDebInfo", None, "-xO2 -g"), + ("sun-cc", "MinSizeRel", None, "-xO2 -xspace"), + ]) + def test_build_type_flags(self, compiler, build_type, vs_toolset, flags): + settings = MockSettings({"compiler": compiler, + "build_type": build_type, + "compiler.toolset": vs_toolset}) + self.assertEqual(' '.join(build_type_flags(settings)), + flags) diff --git a/test/unittests/client/build/cpp_std_flags_test.py b/test/unittests/client/build/cpp_std_flags_test.py new file mode 100644 index 00000000000..c57948be77c --- /dev/null +++ b/test/unittests/client/build/cpp_std_flags_test.py @@ -0,0 +1,331 @@ +import unittest + +from conan.internal.api.detect_api import default_cppstd +from conan.tools.build import cppstd_flag +from conans.model.version import Version +from conan.test.utils.mocks import MockSettings, ConanFileMock + + +def _make_cppstd_flag(compiler, compiler_version, cppstd=None): + conanfile = ConanFileMock() + conanfile.settings = MockSettings({"compiler": compiler, + "compiler.version": compiler_version, + "compiler.cppstd": cppstd}) + return cppstd_flag(conanfile) + + +def _make_cppstd_default(compiler, compiler_version): + return default_cppstd(compiler, Version(compiler_version)) + + +class CompilerFlagsTest(unittest.TestCase): + + def test_gcc_cppstd_flags(self): + self.assertEqual(_make_cppstd_flag("gcc", "4.2", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("gcc", "4.2", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("gcc", "4.2", "11"), None) + self.assertEqual(_make_cppstd_flag("gcc", "4.2", "14"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "4.3", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("gcc", "4.3", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("gcc", "4.3", "11"), "-std=c++0x") + self.assertEqual(_make_cppstd_flag("gcc", "4.3", "14"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "4.6", "11"), '-std=c++0x') + self.assertEqual(_make_cppstd_flag("gcc", "4.6", "14"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "4.7", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "4.7", "14"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "4.8", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "4.8", "14"), '-std=c++1y') + self.assertEqual(_make_cppstd_flag("gcc", "4.8", "17"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "4.9", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "4.9", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "4.9", "17"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "5", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "5", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "5", "gnu14"), '-std=gnu++14') + self.assertEqual(_make_cppstd_flag("gcc", "5", "17"), '-std=c++1z') + self.assertEqual(_make_cppstd_flag("gcc", "5", "gnu17"), '-std=gnu++1z') + + self.assertEqual(_make_cppstd_flag("gcc", "5.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "5.1", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "5.1", "17"), '-std=c++1z') + + self.assertEqual(_make_cppstd_flag("gcc", "7", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "7", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "7", "17"), '-std=c++17') + + self.assertEqual(_make_cppstd_flag("gcc", "8", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "8", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "8", "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("gcc", "8", "20"), '-std=c++2a') + self.assertEqual(_make_cppstd_flag("gcc", "8", "23"), None) + + self.assertEqual(_make_cppstd_flag("gcc", "11", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("gcc", "11", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("gcc", "11", "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("gcc", "11", "20"), '-std=c++2a') + self.assertEqual(_make_cppstd_flag("gcc", "11", "23"), '-std=c++2b') + + def test_gcc_cppstd_defaults(self): + self.assertEqual(_make_cppstd_default("gcc", "4"), "gnu98") + self.assertEqual(_make_cppstd_default("gcc", "5"), "gnu98") + self.assertEqual(_make_cppstd_default("gcc", "6"), "gnu14") + self.assertEqual(_make_cppstd_default("gcc", "6.1"), "gnu14") + self.assertEqual(_make_cppstd_default("gcc", "7.3"), "gnu14") + self.assertEqual(_make_cppstd_default("gcc", "8.1"), "gnu14") + self.assertEqual(_make_cppstd_default("gcc", "11"), "gnu17") + self.assertEqual(_make_cppstd_default("gcc", "11.1"), "gnu17") + + def test_clang_cppstd_flags(self): + self.assertEqual(_make_cppstd_flag("clang", "2.0", "98"), None) + self.assertEqual(_make_cppstd_flag("clang", "2.0", "gnu98"), None) + self.assertEqual(_make_cppstd_flag("clang", "2.0", "11"), None) + self.assertEqual(_make_cppstd_flag("clang", "2.0", "14"), None) + + self.assertEqual(_make_cppstd_flag("clang", "2.1", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("clang", "2.1", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("clang", "2.1", "11"), "-std=c++0x") + self.assertEqual(_make_cppstd_flag("clang", "2.1", "14"), None) + + self.assertEqual(_make_cppstd_flag("clang", "3.0", "11"), '-std=c++0x') + self.assertEqual(_make_cppstd_flag("clang", "3.0", "14"), None) + + self.assertEqual(_make_cppstd_flag("clang", "3.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "3.1", "14"), None) + + self.assertEqual(_make_cppstd_flag("clang", "3.4", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "3.4", "14"), '-std=c++1y') + self.assertEqual(_make_cppstd_flag("clang", "3.4", "17"), None) + + self.assertEqual(_make_cppstd_flag("clang", "3.5", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "3.5", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", "3.5", "17"), '-std=c++1z') + + self.assertEqual(_make_cppstd_flag("clang", "5", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "5", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", "5", "gnu14"), '-std=gnu++14') + self.assertEqual(_make_cppstd_flag("clang", "5", "17"), '-std=c++17') + + self.assertEqual(_make_cppstd_flag("clang", "5.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "5.1", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", "5.1", "17"), '-std=c++17') + + for version in ["6", "7", "8", "9", "10", "11"]: + self.assertEqual(_make_cppstd_flag("clang", version, "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", version, "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", version, "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("clang", version, "20"), '-std=c++2a') + + self.assertEqual(_make_cppstd_flag("clang", "12", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "12", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", "12", "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("clang", "12", "20"), '-std=c++20') + self.assertEqual(_make_cppstd_flag("clang", "12", "23"), '-std=c++2b') + + self.assertEqual(_make_cppstd_flag("clang", "17", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("clang", "17", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("clang", "17", "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("clang", "17", "20"), '-std=c++20') + self.assertEqual(_make_cppstd_flag("clang", "17", "23"), '-std=c++23') + + def test_clang_cppstd_defaults(self): + self.assertEqual(_make_cppstd_default("clang", "2"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "2.1"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "3.0"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "3.1"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "3.4"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "3.5"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "5"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "5.1"), "gnu98") + self.assertEqual(_make_cppstd_default("clang", "6"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "7"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "8"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "9"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "10"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "11"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "12"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "13"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "14"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "15"), "gnu14") + self.assertEqual(_make_cppstd_default("clang", "16"), "gnu17") + + def test_apple_clang_cppstd_flags(self): + self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "98"), None) + self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "gnu98"), None) + self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "11"), None) + self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "14"), None) + + self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "14"), None) + + self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "14"), None) + + self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "gnu98"), "-std=gnu++98") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "14"), "-std=c++1y") + + self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "17"), "-std=c++1z") + + self.assertEqual(_make_cppstd_flag("apple-clang", "7", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("apple-clang", "7", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("apple-clang", "7", "17"), "-std=c++1z") + + self.assertEqual(_make_cppstd_flag("apple-clang", "8", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("apple-clang", "8", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("apple-clang", "8", "17"), "-std=c++1z") + + self.assertEqual(_make_cppstd_flag("apple-clang", "9", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("apple-clang", "9", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("apple-clang", "9", "17"), "-std=c++1z") + + self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "20"), None) + + self.assertEqual(_make_cppstd_flag("apple-clang", "10.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "10.0", "20"), "-std=c++2a") + self.assertEqual(_make_cppstd_flag("apple-clang", "11.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "11.0", "20"), "-std=c++2a") + + self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "20"), "-std=c++2a") + self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "23"), None) + + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu17"), "-std=gnu++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "20"), "-std=c++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu20"), "-std=gnu++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "23"), "-std=c++2b") + self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu23"), "-std=gnu++2b") + + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu17"), "-std=gnu++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "20"), "-std=c++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu20"), "-std=gnu++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "23"), "-std=c++2b") + self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu23"), "-std=gnu++2b") + + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu17"), "-std=gnu++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "20"), "-std=c++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu20"), "-std=gnu++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "23"), "-std=c++2b") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu23"), "-std=gnu++2b") + + def test_apple_clang_cppstd_defaults(self): + self.assertEqual(_make_cppstd_default("apple-clang", "2"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "3"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "4"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "5"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "6"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "7"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "8"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "9"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "10"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "11"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "12"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "13"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "14"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "15"), "gnu98") + + def test_visual_cppstd_flags(self): + self.assertEqual(_make_cppstd_flag("msvc", "170", "11"), None) + self.assertEqual(_make_cppstd_flag("msvc", "170", "14"), None) + self.assertEqual(_make_cppstd_flag("msvc", "170", "17"), None) + + self.assertEqual(_make_cppstd_flag("msvc", "180", "11"), None) + + self.assertEqual(_make_cppstd_flag("msvc", "190", "14"), '/std:c++14') + self.assertEqual(_make_cppstd_flag("msvc", "190", "17"), '/std:c++latest') + + self.assertEqual(_make_cppstd_flag("msvc", "191", "11"), None) + self.assertEqual(_make_cppstd_flag("msvc", "191", "14"), '/std:c++14') + self.assertEqual(_make_cppstd_flag("msvc", "191", "17"), '/std:c++17') + self.assertEqual(_make_cppstd_flag("msvc", "191", "20"), '/std:c++latest') + + self.assertEqual(_make_cppstd_flag("msvc", "192", "17"), '/std:c++17') + self.assertEqual(_make_cppstd_flag("msvc", "192", "20"), '/std:c++20') + + self.assertEqual(_make_cppstd_flag("msvc", "193", "20"), '/std:c++20') + self.assertEqual(_make_cppstd_flag("msvc", "193", "23"), '/std:c++latest') + + def test_visual_cppstd_defaults(self): + self.assertEqual(_make_cppstd_default("msvc", "170"), None) + self.assertEqual(_make_cppstd_default("msvc", "180"), None) + self.assertEqual(_make_cppstd_default("msvc", "190"), "14") + self.assertEqual(_make_cppstd_default("msvc", "191"), "14") + self.assertEqual(_make_cppstd_default("msvc", "192"), "14") + self.assertEqual(_make_cppstd_default("msvc", "193"), "14") + + def test_intel_cppstd_flag(self): + self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "gnu98"), '-std=gnu++98') + self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "11"), '-std=c++11') + self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "14"), '-std=c++14') + self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "17"), '-std=c++17') + self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "20"), '-std=c++20') + + def test_mcst_lcc_cppstd_defaults(self): + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.19"), "gnu98") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.20"), "gnu98") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.21"), "gnu98") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.22"), "gnu98") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.23"), "gnu98") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.24"), "gnu14") + self.assertEqual(_make_cppstd_default("mcst-lcc", "1.25"), "gnu14") + + def test_mcst_lcc_cppstd_flag(self): + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "11"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "14"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "17"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "11"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "14"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "17"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "14"), "-std=c++14") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "17"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "14"), "-std=c++14") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "17"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "14"), "-std=c++14") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "17"), None) + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "14"), "-std=c++14") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "20"), None) + + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "98"), "-std=c++98") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "11"), "-std=c++11") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "14"), "-std=c++14") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "20"), "-std=c++2a") diff --git a/test/unittests/client/conanfile_loader_test.py b/test/unittests/client/conanfile_loader_test.py index b34ad9b8559..69ebb92c1ce 100644 --- a/test/unittests/client/conanfile_loader_test.py +++ b/test/unittests/client/conanfile_loader_test.py @@ -8,7 +8,7 @@ from conans.client.loader import ConanFileLoader, ConanFileTextLoader, load_python_file from conans.errors import ConanException -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save, chdir diff --git a/test/unittests/client/conf/config_installer/test_install_folder.py b/test/unittests/client/conf/config_installer/test_install_folder.py index 77a8efdae37..f2eecc1f359 100644 --- a/test/unittests/client/conf/config_installer/test_install_folder.py +++ b/test/unittests/client/conf/config_installer/test_install_folder.py @@ -2,7 +2,7 @@ import os from conans.client.conf.config_installer import tmp_config_install_folder -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder class InstallFolderTests(unittest.TestCase): diff --git a/test/unittests/client/file_copier/test_report_copied_files.py b/test/unittests/client/file_copier/test_report_copied_files.py index 06a26343c02..ffc1ce82f75 100644 --- a/test/unittests/client/file_copier/test_report_copied_files.py +++ b/test/unittests/client/file_copier/test_report_copied_files.py @@ -2,8 +2,8 @@ from conan.api.output import ConanOutput from conans.model.manifest import FileTreeManifest -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.tools import redirect_output class ReportCopiedFilesTestCase(unittest.TestCase): diff --git a/test/unittests/client/graph/build_mode_test.py b/test/unittests/client/graph/build_mode_test.py index 20d5d96fd7b..b760f707802 100644 --- a/test/unittests/client/graph/build_mode_test.py +++ b/test/unittests/client/graph/build_mode_test.py @@ -3,8 +3,8 @@ from conans.client.graph.build_mode import BuildMode from conans.errors import ConanException from conans.model.recipe_ref import RecipeReference -from conans.test.utils.mocks import ConanFileMock, RedirectedTestOutput -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import ConanFileMock, RedirectedTestOutput +from conan.test.utils.tools import redirect_output @pytest.fixture diff --git a/test/unittests/client/migrations/test_migrator.py b/test/unittests/client/migrations/test_migrator.py index 1794fa0dfe5..66a38636efd 100644 --- a/test/unittests/client/migrations/test_migrator.py +++ b/test/unittests/client/migrations/test_migrator.py @@ -5,7 +5,7 @@ from conans.errors import ConanMigrationError from conans.migrations import Migrator -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder class FakeMigrator(Migrator): diff --git a/test/unittests/client/optimize_conanfile_load_test.py b/test/unittests/client/optimize_conanfile_load_test.py index 6644135f3f5..3180775d530 100644 --- a/test/unittests/client/optimize_conanfile_load_test.py +++ b/test/unittests/client/optimize_conanfile_load_test.py @@ -1,6 +1,6 @@ import unittest -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class OptimizeConanFileLoadTest(unittest.TestCase): diff --git a/test/unittests/client/profile_loader/compiler_cppstd_test.py b/test/unittests/client/profile_loader/compiler_cppstd_test.py index 36085396819..2046afafbad 100644 --- a/test/unittests/client/profile_loader/compiler_cppstd_test.py +++ b/test/unittests/client/profile_loader/compiler_cppstd_test.py @@ -12,7 +12,7 @@ from conans.errors import ConanException from conans.model.conf import ConfDefinition from conans.model.settings import Settings -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/client/profile_loader/profile_loader_test.py b/test/unittests/client/profile_loader/profile_loader_test.py index 22e4e875f11..3b2cc7504c0 100644 --- a/test/unittests/client/profile_loader/profile_loader_test.py +++ b/test/unittests/client/profile_loader/profile_loader_test.py @@ -6,8 +6,8 @@ from conans.client.profile_loader import _ProfileParser, ProfileLoader from conans.errors import ConanException from conans.model.recipe_ref import RecipeReference -from conans.test.utils.mocks import ConanFileMock, MockSettings -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/client/remote_manager_test.py b/test/unittests/client/remote_manager_test.py index a10f3073797..966b0e608cf 100644 --- a/test/unittests/client/remote_manager_test.py +++ b/test/unittests/client/remote_manager_test.py @@ -3,7 +3,7 @@ from conans.client.cmd.uploader import compress_files from conans.paths import PACKAGE_TGZ_NAME -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/client/toolchain/autotools/autotools_test.py b/test/unittests/client/toolchain/autotools/autotools_test.py index 3d1f919102c..42a51d1966c 100644 --- a/test/unittests/client/toolchain/autotools/autotools_test.py +++ b/test/unittests/client/toolchain/autotools/autotools_test.py @@ -4,9 +4,9 @@ from conan.tools.gnu import Autotools from conan import ConanFile from conans.model.conf import Conf -from conans.test.unittests.util.tools_test import RunnerMock -from conans.test.utils.mocks import MockSettings -from conans.test.utils.test_files import temp_folder +from test.unittests.util.tools_test import RunnerMock +from conan.test.utils.mocks import MockSettings +from conan.test.utils.test_files import temp_folder def test_configure_arguments(): diff --git a/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py b/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py index 6c7dd86b207..5ea435a3ffa 100644 --- a/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py +++ b/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py @@ -7,8 +7,8 @@ from conan.tools.gnu import AutotoolsToolchain from conans.errors import ConanException from conans.model.conf import Conf -from conans.test.utils.mocks import ConanFileMock, MockSettings, MockOptions -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock, MockSettings, MockOptions +from conan.test.utils.test_files import temp_folder def test_modify_environment(): diff --git a/test/unittests/client/tools/apple/test_xcodebuild.py b/test/unittests/client/tools/apple/test_xcodebuild.py index 3b994a7425a..b2c191c0d67 100644 --- a/test/unittests/client/tools/apple/test_xcodebuild.py +++ b/test/unittests/client/tools/apple/test_xcodebuild.py @@ -2,7 +2,7 @@ from conan.tools.apple import XcodeBuild from conans.model.conf import ConfDefinition -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.mark.parametrize("mode", ["quiet", None, "verbose"]) diff --git a/test/unittests/client/tools/cppstd_required_test.py b/test/unittests/client/tools/cppstd_required_test.py index e10ade836ac..683fc4bbcba 100644 --- a/test/unittests/client/tools/cppstd_required_test.py +++ b/test/unittests/client/tools/cppstd_required_test.py @@ -3,7 +3,7 @@ from parameterized import parameterized from conan.tools.build import check_max_cppstd, check_min_cppstd, valid_max_cppstd, valid_min_cppstd -from conans.test.utils.mocks import MockSettings, ConanFileMock +from conan.test.utils.mocks import MockSettings, ConanFileMock from conans.errors import ConanInvalidConfiguration, ConanException diff --git a/test/unittests/client/tools/files/rename_test.py b/test/unittests/client/tools/files/rename_test.py index 63eb1865857..d311e2d456d 100644 --- a/test/unittests/client/tools/files/rename_test.py +++ b/test/unittests/client/tools/files/rename_test.py @@ -2,7 +2,7 @@ import unittest from conan.tools.files import rename -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import chdir diff --git a/test/unittests/model/conanfile_test.py b/test/unittests/model/conanfile_test.py index 6d1be5d91fa..b8adb93b314 100644 --- a/test/unittests/model/conanfile_test.py +++ b/test/unittests/model/conanfile_test.py @@ -2,7 +2,7 @@ import unittest from conans.model.conan_file import ConanFile -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient class ConanFileTest(unittest.TestCase): diff --git a/test/unittests/model/manifest_test.py b/test/unittests/model/manifest_test.py index fffced37f5a..830b372819a 100644 --- a/test/unittests/model/manifest_test.py +++ b/test/unittests/model/manifest_test.py @@ -4,7 +4,7 @@ import pytest from conans.model.manifest import FileTreeManifest -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import load, md5, save diff --git a/test/unittests/model/other_settings_test.py b/test/unittests/model/other_settings_test.py index 05ed511af40..bbd309c98ee 100644 --- a/test/unittests/model/other_settings_test.py +++ b/test/unittests/model/other_settings_test.py @@ -5,7 +5,7 @@ from conans.model.info import load_binary_info from conans.model.recipe_ref import RecipeReference from conans.paths import CONANFILE -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient from conans.util.files import load, save diff --git a/test/unittests/model/version/test_version_range.py b/test/unittests/model/version/test_version_range.py index da684f08e04..29b83685df0 100644 --- a/test/unittests/model/version/test_version_range.py +++ b/test/unittests/model/version/test_version_range.py @@ -5,7 +5,7 @@ from conans.errors import ConanException from conans.model.version import Version from conans.model.version_range import VersionRange -from conans.test.utils.tools import TestClient +from conan.test.utils.tools import TestClient values = [ ['=1.0.0', [[['=', '1.0.0']]], ["1.0.0"], ["0.1"]], diff --git a/test/unittests/paths/user_home_test.py b/test/unittests/paths/user_home_test.py index f69ec99ccc5..61b28eddf36 100644 --- a/test/unittests/paths/user_home_test.py +++ b/test/unittests/paths/user_home_test.py @@ -3,7 +3,7 @@ from pathlib import Path from conans.paths import get_conan_user_home, DEFAULT_CONAN_HOME -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import chdir if platform.system() == "Windows": diff --git a/test/unittests/server/authenticator_plugin_test.py b/test/unittests/server/authenticator_plugin_test.py index c867bcb5d04..f9b626940ba 100644 --- a/test/unittests/server/authenticator_plugin_test.py +++ b/test/unittests/server/authenticator_plugin_test.py @@ -2,7 +2,7 @@ import unittest from conans.server.plugin_loader import load_authentication_plugin -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/server/conan_server_config_parser_test.py b/test/unittests/server/conan_server_config_parser_test.py index 4a614e07d4b..c4197e48e74 100644 --- a/test/unittests/server/conan_server_config_parser_test.py +++ b/test/unittests/server/conan_server_config_parser_test.py @@ -4,7 +4,7 @@ from conans.errors import ConanException from conans.server.conf import ConanServerConfigParser -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import mkdir, save diff --git a/test/unittests/server/conf_test.py b/test/unittests/server/conf_test.py index 27710ceaf2e..d2d1f91a3fa 100644 --- a/test/unittests/server/conf_test.py +++ b/test/unittests/server/conf_test.py @@ -5,7 +5,7 @@ from conans.errors import ConanException from conans.paths import conan_expand_user from conans.server.conf import ConanServerConfigParser -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.config_parser import ConfigParser from conans.util.files import save diff --git a/test/unittests/server/service/service_test.py b/test/unittests/server/service/service_test.py index 10406efe3ce..fbdcbe8cbb0 100644 --- a/test/unittests/server/service/service_test.py +++ b/test/unittests/server/service/service_test.py @@ -12,8 +12,8 @@ from conans.server.service.v2.service_v2 import ConanServiceV2 from conans.server.store.disk_adapter import ServerDiskAdapter from conans.server.store.server_store import ServerStore -from conans.test.assets.genconanfile import GenConanfile -from conans.test.utils.test_files import temp_folder +from conan.test.assets.genconanfile import GenConanfile +from conan.test.utils.test_files import temp_folder from conans.util.files import save, save_files diff --git a/test/unittests/server/test_utils.py b/test/unittests/server/test_utils.py index 42909f07d0c..5647e1a5132 100644 --- a/test/unittests/server/test_utils.py +++ b/test/unittests/server/test_utils.py @@ -1,7 +1,7 @@ import os from conans.server.utils.files import path_exists -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import mkdir diff --git a/test/unittests/source/merge_directories_test.py b/test/unittests/source/merge_directories_test.py index b0c99743ee7..f840906d870 100644 --- a/test/unittests/source/merge_directories_test.py +++ b/test/unittests/source/merge_directories_test.py @@ -6,7 +6,7 @@ import pytest from conans.errors import ConanException -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import mkdir, save, merge_directories, load diff --git a/test/unittests/tools/android/test_android_tools.py b/test/unittests/tools/android/test_android_tools.py index 14aa608df5a..508cdd52dd5 100644 --- a/test/unittests/tools/android/test_android_tools.py +++ b/test/unittests/tools/android/test_android_tools.py @@ -1,4 +1,4 @@ -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings from conans.errors import ConanException from conan.tools.android import android_abi diff --git a/test/unittests/tools/apple/test_apple_tools.py b/test/unittests/tools/apple/test_apple_tools.py index ee8586b713f..dddaa6ccb61 100644 --- a/test/unittests/tools/apple/test_apple_tools.py +++ b/test/unittests/tools/apple/test_apple_tools.py @@ -4,8 +4,8 @@ from conan.internal.internal_tools import is_universal_arch from conans.errors import ConanException -from conans.test.utils.mocks import ConanFileMock, MockSettings, MockOptions -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock, MockSettings, MockOptions +from conan.test.utils.test_files import temp_folder from conan.tools.apple import is_apple_os, to_apple_arch, fix_apple_shared_install_name, XCRun from conan.tools.apple.apple import _get_dylib_install_name diff --git a/test/unittests/tools/build/__init__.py b/test/unittests/tools/build/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/unittests/tools/build/test_can_run.py b/test/unittests/tools/build/test_can_run.py new file mode 100644 index 00000000000..d8a193b364c --- /dev/null +++ b/test/unittests/tools/build/test_can_run.py @@ -0,0 +1,66 @@ +import pytest + +from conan.test.utils.mocks import MockSettings, ConanFileMock +from conan.tools.build import can_run + + +class ConfigMock: + def __init__(self, run=None): + self.can_run = run + + def get(self, conf_name, default=None, check_type=None): + return self.can_run + + +@pytest.mark.parametrize("expected", [False, True]) +def test_can_run_explicit_config(expected): + """ When the config tools.build.cross_building:can_run is declared and evaluated (True|False), + can_run must return the same value. + """ + config = ConfigMock(expected) + settings = MockSettings({"os": "Macos", + "compiler": "apple-clang", + "compiler.version": "11.0", + "arch": "armv8"}) + conanfile = ConanFileMock(settings) + conanfile.conf = config + assert expected == can_run(conanfile) + + +@pytest.mark.parametrize("arch, expected", [("x86_64", False), ("armv8", True)]) +def test_can_run_cross_building(arch, expected): + """ When the config is None, and is cross-building, can_run must return False. + """ + config = ConfigMock(None) + settings_build = MockSettings({"os": "Macos", + "compiler": "apple-clang", + "compiler.version": "11.0", + "arch": "armv8"}) + settings = MockSettings({"os": "Macos", + "compiler": "apple-clang", + "compiler.version": "11.0", + "arch": arch}) + conanfile = ConanFileMock() + conanfile.settings = settings + conanfile.settings_build = settings_build + conanfile.conf = config + assert expected == can_run(conanfile) + + +def test_can_run_cross_building_with_explicit(): + """ When the config is True or False, and is cross-building, can_run must follow the config. + """ + config = ConfigMock(True) + settings_build = MockSettings({"os": "Macos", + "compiler": "apple-clang", + "compiler.version": "11.0", + "arch": "armv8"}) + settings = MockSettings({"os": "Macos", + "compiler": "apple-clang", + "compiler.version": "11.0", + "arch": "x86_64"}) + conanfile = ConanFileMock() + conanfile.settings = settings + conanfile.settings_build = settings_build + conanfile.conf = config + assert True == can_run(conanfile) diff --git a/test/unittests/tools/build/test_cppstd.py b/test/unittests/tools/build/test_cppstd.py new file mode 100644 index 00000000000..62c6176256a --- /dev/null +++ b/test/unittests/tools/build/test_cppstd.py @@ -0,0 +1,226 @@ +import pytest + +from conan.internal.api.detect_api import detect_cppstd +from conan.tools.build import supported_cppstd, check_min_cppstd, valid_min_cppstd +from conans.errors import ConanException, ConanInvalidConfiguration +from conans.model.version import Version +from conan.test.utils.mocks import MockSettings, ConanFileMock + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("clang", "2.0", []), + ("clang", "2.1", ['98', 'gnu98', '11', 'gnu11']), + ("clang", "2.2", ['98', 'gnu98', '11', 'gnu11']), + ("clang", "3.1", ['98', 'gnu98', '11', 'gnu11']), + ("clang", "3.4", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]), + ("clang", "3.5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("clang", "4.9", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("clang", "5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("clang", "6", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"]), + ("clang", "12", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", + "gnu20", "23", "gnu23"]) +]) +def test_supported_cppstd_clang(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +@pytest.mark.parametrize("compiler,compiler_version,result", [ + ("gcc", "5", 'gnu98'), + ("gcc", "8", "gnu14"), + ("gcc", "12", "gnu17"), + ("msvc", "190", "14"), + ("apple-clang", "10.0", "gnu98"), + # We diverge from the default cppstd for apple-clang >= 11 + ("apple-clang", "12.0", "gnu17"), + ("clang", "4", "gnu98"), + ("clang", "6", "gnu14"), + ("clang", "17", "gnu17") +]) +def test_detected_cppstd(compiler, compiler_version, result): + sot = detect_cppstd(compiler, Version(compiler_version)) + assert sot == result + + +def test_supported_cppstd_with_specific_values(): + settings = MockSettings({}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile, "clang", "3.1") + assert sot == ['98', 'gnu98', '11', 'gnu11'] + + +def test_supported_cppstd_error(): + settings = MockSettings({}) + conanfile = ConanFileMock(settings) + with pytest.raises(ConanException) as exc: + supported_cppstd(conanfile) + assert "Called supported_cppstd with no compiler or no compiler.version" in str(exc) + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("gcc", "2.0", []), + ("gcc", "3.4", ['98', 'gnu98']), + ("gcc", "4.2", ['98', 'gnu98']), + ("gcc", "4.3", ['98', 'gnu98', '11', 'gnu11']), + ("gcc", "4.8", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]), + ("gcc", "5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("gcc", "8", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"]), + ("gcc", "11", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20", + "23", "gnu23"]) +]) +def test_supported_cppstd_gcc(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("apple-clang", "3.9", []), + ("apple-clang", "4.0", ['98', 'gnu98', '11', 'gnu11']), + ("apple-clang", "5.0", ['98', 'gnu98', '11', 'gnu11']), + ("apple-clang", "5.1", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]), + ("apple-clang", "6.1", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("apple-clang", "9.5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("apple-clang", "10", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", + "gnu20"]), + ("apple-clang", "13", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", + "gnu20", "23", "gnu23"]), +]) +def test_supported_cppstd_apple_clang(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("msvc", "180", []), + ("msvc", "190", ['14']), + ("msvc", "191", ['14', '17']), + ("msvc", "192", ['14', '17', '20']), + ("msvc", "193", ['14', '17', '20', '23']), +]) +def test_supported_cppstd_msvc(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("mcst-lcc", "1.20", ['98', 'gnu98']), + ("mcst-lcc", "1.21", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]), + ("mcst-lcc", "1.23", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]), + ("mcst-lcc", "1.24", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("mcst-lcc", "1.25", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"]) +]) +def test_supported_cppstd_mcst(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +@pytest.mark.parametrize("compiler,compiler_version,values", [ + ("qcc", "4.4", ['98', 'gnu98']), + ("qcc", "5.4", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), + ("qcc", "8.3", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]), +]) +def test_supported_cppstd_qcc(compiler, compiler_version, values): + settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version}) + conanfile = ConanFileMock(settings) + sot = supported_cppstd(conanfile) + assert sot == values + + +def test_check_cppstd_type(): + """ cppstd must be a number + """ + conanfile = ConanFileMock(MockSettings({})) + with pytest.raises(ConanException) as exc: + check_min_cppstd(conanfile, "gnu17", False) + + assert "cppstd parameter must be a number", str(exc) + + +def _create_conanfile(compiler, version, os, cppstd, libcxx=None): + settings = MockSettings({"arch": "x86_64", + "build_type": "Debug", + "os": os, + "compiler": compiler, + "compiler.version": version, + "compiler.cppstd": cppstd}) + if libcxx: + settings.values["compiler.libcxx"] = libcxx + conanfile = ConanFileMock(settings) + return conanfile + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"]) +def test_check_min_cppstd_from_settings(cppstd): + """ check_min_cppstd must accept cppstd less/equal than cppstd in settings + """ + conanfile = _create_conanfile("gcc", "9", "Linux", "17", "libstdc++") + check_min_cppstd(conanfile, cppstd, False) + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14"]) +def test_check_min_cppstd_from_outdated_settings(cppstd): + """ check_min_cppstd must raise when cppstd is greater when supported on settings + """ + conanfile = _create_conanfile("gcc", "9", "Linux", cppstd, "libstdc++") + with pytest.raises(ConanInvalidConfiguration) as exc: + check_min_cppstd(conanfile, "17", False) + assert "Current cppstd ({}) is lower than the required C++ standard (17)." \ + "".format(cppstd) == str(exc.value) + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"]) +def test_check_min_cppstd_from_settings_with_extension(cppstd): + """ current cppstd in settings must has GNU extension when extensions is enabled + """ + conanfile = _create_conanfile("gcc", "9", "Linux", "gnu17", "libstdc++") + check_min_cppstd(conanfile, cppstd, True) + + conanfile.settings.values["compiler.cppstd"] = "17" + with pytest.raises(ConanException) as raises: + check_min_cppstd(conanfile, cppstd, True) + assert "The cppstd GNU extension is required" == str(raises.value) + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"]) +def test_valid_min_cppstd_from_settings(cppstd): + """ valid_min_cppstd must accept cppstd less/equal than cppstd in settings + """ + conanfile = _create_conanfile("gcc", "9", "Linux", "17", "libstdc++") + assert valid_min_cppstd(conanfile, cppstd, False) + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14"]) +def test_valid_min_cppstd_from_outdated_settings(cppstd): + """ valid_min_cppstd returns False when cppstd is greater when supported on settings + """ + conanfile = _create_conanfile("gcc", "9", "Linux", cppstd, "libstdc++") + assert not valid_min_cppstd(conanfile, "17", False) + + +@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"]) +def test_valid_min_cppstd_from_settings_with_extension(cppstd): + """ valid_min_cppstd must returns True when current cppstd in settings has GNU extension and + extensions is enabled + """ + conanfile = _create_conanfile("gcc", "9", "Linux", "gnu17", "libstdc++") + assert valid_min_cppstd(conanfile, cppstd, True) + + conanfile.settings.values["compiler.cppstd"] = "17" + assert not valid_min_cppstd(conanfile, cppstd, True) + + +def test_valid_min_cppstd_unsupported_standard(): + """ valid_min_cppstd must returns False when the compiler does not support a standard + """ + conanfile = _create_conanfile("gcc", "9", "Linux", None, "libstdc++") + assert not valid_min_cppstd(conanfile, "42", False) diff --git a/test/unittests/tools/build/test_cross_building.py b/test/unittests/tools/build/test_cross_building.py new file mode 100644 index 00000000000..44337faa76b --- /dev/null +++ b/test/unittests/tools/build/test_cross_building.py @@ -0,0 +1,16 @@ +import pytest + +from conan.tools.build import cross_building +from conan.test.utils.mocks import ConanFileMock + + +@pytest.mark.parametrize("cross_build", (True, False)) +def test_using_cross_build_conf(cross_build): + """ + Tests cross_building function is using the conf variable to force or not. + + Issue related: https://github.com/conan-io/conan/issues/15392 + """ + conanfile = ConanFileMock() + conanfile.conf.define("tools.build.cross_building:cross_build", cross_build) + assert cross_building(conanfile) == cross_build diff --git a/test/unittests/tools/build/test_stdcpp_library.py b/test/unittests/tools/build/test_stdcpp_library.py new file mode 100644 index 00000000000..0b59c70f3e8 --- /dev/null +++ b/test/unittests/tools/build/test_stdcpp_library.py @@ -0,0 +1,18 @@ +import pytest +from conan.tools.build import stdcpp_library +from conan.test.utils.mocks import MockSettings, ConanFileMock + + +@pytest.mark.parametrize("libcxx,expected_library", [ + ("libstdc++", "stdc++"), + ("libstdc++11", "stdc++"), + ("libc++", "c++"), + ("c++_shared", "c++_shared"), + ("c++_static", "c++_static"), + ("foobar", None) +]) +def test_stdcpp_library(libcxx, expected_library): + settings = MockSettings({"compiler.libcxx": libcxx}) + conanfile = ConanFileMock(settings) + + assert stdcpp_library(conanfile) == expected_library diff --git a/test/unittests/tools/cmake/test_cmake_cmd_line_args.py b/test/unittests/tools/cmake/test_cmake_cmd_line_args.py index 524e32264fe..b1c7dd860bb 100644 --- a/test/unittests/tools/cmake/test_cmake_cmd_line_args.py +++ b/test/unittests/tools/cmake/test_cmake_cmd_line_args.py @@ -4,7 +4,7 @@ from conan.tools.cmake.cmake import _cmake_cmd_line_args from conans.model.conf import ConfDefinition -from conans.test.utils.mocks import ConanFileMock +from conan.test.utils.mocks import ConanFileMock @pytest.fixture diff --git a/test/unittests/tools/cmake/test_cmake_install.py b/test/unittests/tools/cmake/test_cmake_install.py index ab411cc3f2e..48308d6f295 100644 --- a/test/unittests/tools/cmake/test_cmake_install.py +++ b/test/unittests/tools/cmake/test_cmake_install.py @@ -3,8 +3,8 @@ from conans.client.conf import get_default_settings_yml from conans.model.conf import Conf from conans.model.settings import Settings -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder def test_run_install_component(): diff --git a/test/unittests/tools/cmake/test_cmake_presets_definitions.py b/test/unittests/tools/cmake/test_cmake_presets_definitions.py index 8e06972d472..0d15efc1292 100644 --- a/test/unittests/tools/cmake/test_cmake_presets_definitions.py +++ b/test/unittests/tools/cmake/test_cmake_presets_definitions.py @@ -6,7 +6,7 @@ from conans.model.conan_file import ConanFile from conans.model.conf import Conf from conans.model.settings import Settings -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder @pytest.fixture(scope="module") diff --git a/test/unittests/tools/cmake/test_cmake_test.py b/test/unittests/tools/cmake/test_cmake_test.py index a49666a702f..aab3e284edc 100644 --- a/test/unittests/tools/cmake/test_cmake_test.py +++ b/test/unittests/tools/cmake/test_cmake_test.py @@ -5,8 +5,8 @@ from conans.client.conf import get_default_settings_yml from conans.model.conf import Conf from conans.model.settings import Settings -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder @pytest.mark.parametrize("generator,target", [ diff --git a/test/unittests/tools/env/test_env.py b/test/unittests/tools/env/test_env.py index 37f9fd0205e..92eba38542c 100644 --- a/test/unittests/tools/env/test_env.py +++ b/test/unittests/tools/env/test_env.py @@ -9,8 +9,8 @@ from conan.tools.env.environment import ProfileEnvironment from conans.client.subsystems import WINDOWS from conans.model.recipe_ref import RecipeReference -from conans.test.utils.mocks import ConanFileMock, MockSettings -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.test_files import temp_folder from conans.util.env import environment_update from conans.util.files import save, chdir diff --git a/test/unittests/tools/env/test_env_files.py b/test/unittests/tools/env/test_env_files.py index b0873ef1ebf..9feb80cd85c 100644 --- a/test/unittests/tools/env/test_env_files.py +++ b/test/unittests/tools/env/test_env_files.py @@ -8,8 +8,8 @@ from conan.tools.env import Environment from conans.client.subsystems import WINDOWS -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import save, chdir, load diff --git a/test/unittests/tools/files/checksums_test.py b/test/unittests/tools/files/checksums_test.py index c437a4fce59..27e020756b6 100644 --- a/test/unittests/tools/files/checksums_test.py +++ b/test/unittests/tools/files/checksums_test.py @@ -1,7 +1,7 @@ import os from conan.tools.files import check_md5, check_sha1, check_sha256 -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/tools/files/collect_lib_test.py b/test/unittests/tools/files/collect_lib_test.py index cfa0b44578e..73c62d4d4e3 100644 --- a/test/unittests/tools/files/collect_lib_test.py +++ b/test/unittests/tools/files/collect_lib_test.py @@ -5,9 +5,9 @@ from conan.tools.files import collect_libs from conans.model.build_info import CppInfo -from conans.test.utils.mocks import ConanFileMock, RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import ConanFileMock, RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output from conans.util.files import save diff --git a/test/unittests/tools/files/test_downloads.py b/test/unittests/tools/files/test_downloads.py index 8d063306db0..f589900270d 100644 --- a/test/unittests/tools/files/test_downloads.py +++ b/test/unittests/tools/files/test_downloads.py @@ -5,10 +5,10 @@ from conan.tools.files import ftp_download, download, get from conans.errors import ConanException, AuthenticationException -from conans.test.utils.file_server import TestFileServer -from conans.test.utils.mocks import ConanFileMock, RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output, TestRequester +from conan.test.utils.file_server import TestFileServer +from conan.test.utils.mocks import ConanFileMock, RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output, TestRequester from conans.util.files import save, load, chdir, mkdir diff --git a/test/unittests/tools/files/test_file_read_and_write.py b/test/unittests/tools/files/test_file_read_and_write.py index 7c7e9607ac2..4a6d12ab19d 100644 --- a/test/unittests/tools/files/test_file_read_and_write.py +++ b/test/unittests/tools/files/test_file_read_and_write.py @@ -4,8 +4,8 @@ import os from conan.tools.files import replace_in_file, save, load -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder def test_save_and_load_encoding(): diff --git a/test/unittests/tools/files/test_patches.py b/test/unittests/tools/files/test_patches.py index 4814ca815e8..4327f55a757 100644 --- a/test/unittests/tools/files/test_patches.py +++ b/test/unittests/tools/files/test_patches.py @@ -5,8 +5,8 @@ from conan.tools.files import patch, apply_conandata_patches from conans.errors import ConanException -from conans.test.utils.mocks import ConanFileMock, RedirectedTestOutput -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import ConanFileMock, RedirectedTestOutput +from conan.test.utils.tools import redirect_output class MockPatchset: diff --git a/test/unittests/tools/files/test_rename.py b/test/unittests/tools/files/test_rename.py index 4f8570f2407..63062271659 100644 --- a/test/unittests/tools/files/test_rename.py +++ b/test/unittests/tools/files/test_rename.py @@ -3,8 +3,8 @@ import pytest from conan.tools.files import rename -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.tools import temp_folder, save_files +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.tools import temp_folder, save_files def test_rename_file(): diff --git a/test/unittests/tools/files/test_rm.py b/test/unittests/tools/files/test_rm.py index 1cfbb4dd031..75f32fa84cd 100644 --- a/test/unittests/tools/files/test_rm.py +++ b/test/unittests/tools/files/test_rm.py @@ -2,7 +2,7 @@ # Check it is importable from tools from conan.tools.files import rm, chdir -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save_files diff --git a/test/unittests/tools/files/test_symlinks.py b/test/unittests/tools/files/test_symlinks.py index 81cfb3a6133..52f7d50f379 100644 --- a/test/unittests/tools/files/test_symlinks.py +++ b/test/unittests/tools/files/test_symlinks.py @@ -5,7 +5,7 @@ from conan import tools from conan.tools.files import mkdir -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder @pytest.fixture diff --git a/test/unittests/tools/files/test_tool_copy.py b/test/unittests/tools/files/test_tool_copy.py index e0a2ec49449..8b7380abd68 100644 --- a/test/unittests/tools/files/test_tool_copy.py +++ b/test/unittests/tools/files/test_tool_copy.py @@ -6,7 +6,7 @@ import pytest from conan.tools.files import copy -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import load, save, mkdir, save_files, chdir diff --git a/test/unittests/tools/files/test_toolchain.py b/test/unittests/tools/files/test_toolchain.py index 0a39eb9f8ee..5e2abf6c860 100644 --- a/test/unittests/tools/files/test_toolchain.py +++ b/test/unittests/tools/files/test_toolchain.py @@ -6,7 +6,7 @@ from conan.tools.build import load_toolchain_args, save_toolchain_args, CONAN_TOOLCHAIN_ARGS_FILE, \ CONAN_TOOLCHAIN_ARGS_SECTION from conans.errors import ConanException -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import save, load diff --git a/test/unittests/tools/files/test_zipping.py b/test/unittests/tools/files/test_zipping.py index a91a81e2241..42e89bcee20 100644 --- a/test/unittests/tools/files/test_zipping.py +++ b/test/unittests/tools/files/test_zipping.py @@ -5,8 +5,8 @@ import pytest from conan.tools.files import unzip -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/tools/files_patch_test.py b/test/unittests/tools/files_patch_test.py index ef747fe5438..cdfb1ea8ff7 100644 --- a/test/unittests/tools/files_patch_test.py +++ b/test/unittests/tools/files_patch_test.py @@ -5,8 +5,8 @@ from parameterized.parameterized import parameterized from conans.client.loader import ConanFileLoader -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import save, load base_conanfile = ''' diff --git a/test/unittests/tools/gnu/autotools_test.py b/test/unittests/tools/gnu/autotools_test.py index 0ffc24e9cc3..97b1a22130d 100644 --- a/test/unittests/tools/gnu/autotools_test.py +++ b/test/unittests/tools/gnu/autotools_test.py @@ -3,8 +3,8 @@ from conan.tools.build import save_toolchain_args from conan.tools.gnu import Autotools -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder @patch('conan.tools.gnu.autotools.chdir') diff --git a/test/unittests/tools/gnu/autotoolschain_test.py b/test/unittests/tools/gnu/autotoolschain_test.py index d54f447f3ca..064a69225bf 100644 --- a/test/unittests/tools/gnu/autotoolschain_test.py +++ b/test/unittests/tools/gnu/autotoolschain_test.py @@ -6,7 +6,7 @@ from conan.tools.gnu import AutotoolsToolchain from conans.errors import ConanException from conans.model.conf import Conf -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.fixture() diff --git a/test/unittests/tools/gnu/gnudepsflags_test.py b/test/unittests/tools/gnu/gnudepsflags_test.py index 1584af11ce3..3e62b9a0f97 100644 --- a/test/unittests/tools/gnu/gnudepsflags_test.py +++ b/test/unittests/tools/gnu/gnudepsflags_test.py @@ -3,7 +3,7 @@ from conan.tools.apple.apple import is_apple_os from conan.tools.gnu.gnudeps_flags import GnuDepsFlags -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.mark.parametrize("os_", ["Macos", "Windows", "Linux"]) diff --git a/test/unittests/tools/gnu/test_gnutoolchain.py b/test/unittests/tools/gnu/test_gnutoolchain.py index faaa43da40e..eb1033939e0 100644 --- a/test/unittests/tools/gnu/test_gnutoolchain.py +++ b/test/unittests/tools/gnu/test_gnutoolchain.py @@ -6,7 +6,7 @@ from conan.tools.gnu import GnuToolchain from conans.errors import ConanException from conans.model.conf import Conf -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.fixture() diff --git a/test/unittests/tools/google/test_bazel.py b/test/unittests/tools/google/test_bazel.py index 3fb80ca547e..dae3611bf25 100644 --- a/test/unittests/tools/google/test_bazel.py +++ b/test/unittests/tools/google/test_bazel.py @@ -8,8 +8,8 @@ from conan.tools.google import Bazel from conan.tools.google.bazeldeps import _relativize_path, _get_libs from conans.model.options import Options -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder @pytest.fixture(scope="module") diff --git a/test/unittests/tools/intel/test_intel_cc.py b/test/unittests/tools/intel/test_intel_cc.py index bd38aee2290..8b9a6d4b361 100644 --- a/test/unittests/tools/intel/test_intel_cc.py +++ b/test/unittests/tools/intel/test_intel_cc.py @@ -8,7 +8,7 @@ from conan.tools.intel import IntelCC from conans.errors import ConanException from conans.model.conf import ConfDefinition -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings @pytest.mark.parametrize("os_,arch,expected", [ diff --git a/test/unittests/tools/meson/test_meson.py b/test/unittests/tools/meson/test_meson.py index 0c72caac443..8998347a7b2 100644 --- a/test/unittests/tools/meson/test_meson.py +++ b/test/unittests/tools/meson/test_meson.py @@ -2,7 +2,7 @@ from conan.tools.meson import Meson from conans.model.conf import ConfDefinition -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings def test_meson_build(): diff --git a/test/unittests/tools/microsoft/test_check_min_vs.py b/test/unittests/tools/microsoft/test_check_min_vs.py index 443ff87b21e..a480e163df3 100644 --- a/test/unittests/tools/microsoft/test_check_min_vs.py +++ b/test/unittests/tools/microsoft/test_check_min_vs.py @@ -2,7 +2,7 @@ from conan.tools.microsoft import check_min_vs from conans.errors import ConanInvalidConfiguration -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings class TestCheckMinVS: diff --git a/test/unittests/tools/microsoft/test_msbuild.py b/test/unittests/tools/microsoft/test_msbuild.py index 58e3285a6ec..9f0e5b1bf8a 100644 --- a/test/unittests/tools/microsoft/test_msbuild.py +++ b/test/unittests/tools/microsoft/test_msbuild.py @@ -7,8 +7,8 @@ from conan.tools.microsoft import MSBuild, MSBuildToolchain, is_msvc, is_msvc_static_runtime from conans.model.conf import ConfDefinition, Conf from conans.model.settings import Settings -from conans.test.utils.mocks import MockSettings, ConanFileMock, MockOptions -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import MockSettings, ConanFileMock, MockOptions +from conan.test.utils.test_files import temp_folder from conans.util.files import load diff --git a/test/unittests/tools/microsoft/test_msvs_toolset.py b/test/unittests/tools/microsoft/test_msvs_toolset.py index 14574127e26..e7b70a3f964 100644 --- a/test/unittests/tools/microsoft/test_msvs_toolset.py +++ b/test/unittests/tools/microsoft/test_msvs_toolset.py @@ -1,7 +1,7 @@ import pytest from conan.tools.microsoft import msvs_toolset from conan.errors import ConanException -from conans.test.utils.mocks import ConanFileMock, MockSettings +from conan.test.utils.mocks import ConanFileMock, MockSettings def test_invalid_compiler(): diff --git a/test/unittests/tools/microsoft/test_subsystem.py b/test/unittests/tools/microsoft/test_subsystem.py index b0fbb501192..be4ae1ef10c 100644 --- a/test/unittests/tools/microsoft/test_subsystem.py +++ b/test/unittests/tools/microsoft/test_subsystem.py @@ -4,7 +4,7 @@ from conan.tools.microsoft import unix_path, unix_path_package_info_legacy from conans.model.conf import ConfDefinition -from conans.test.utils.mocks import MockSettings, ConanFileMock +from conan.test.utils.mocks import MockSettings, ConanFileMock expected_results = [ ("msys2", '/c/path/to/stuff'), diff --git a/test/unittests/util/apple_test.py b/test/unittests/util/apple_test.py index c1e27624f5b..4827a292bd0 100644 --- a/test/unittests/util/apple_test.py +++ b/test/unittests/util/apple_test.py @@ -7,7 +7,7 @@ from conan.tools.apple.apple import _to_apple_arch, apple_min_version_flag, \ is_apple_os -from conans.test.utils.mocks import MockSettings, ConanFileMock +from conan.test.utils.mocks import MockSettings, ConanFileMock class FakeSettings(object): diff --git a/test/unittests/util/conanfile_tools_test.py b/test/unittests/util/conanfile_tools_test.py index c98f0d9d3bf..d3e573d96ab 100644 --- a/test/unittests/util/conanfile_tools_test.py +++ b/test/unittests/util/conanfile_tools_test.py @@ -3,10 +3,10 @@ import unittest from conan.tools.files import replace_in_file, unzip -from conans.test.utils.mocks import ConanFileMock +from conan.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient from conans.util.files import load, save diff --git a/test/unittests/util/detect_test.py b/test/unittests/util/detect_test.py index c5272a00536..28b004230c7 100644 --- a/test/unittests/util/detect_test.py +++ b/test/unittests/util/detect_test.py @@ -5,8 +5,8 @@ from conans.client.conf.detect import detect_defaults_settings from conans.model.version import Version -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.tools import redirect_output from conans.util.env import environment_update diff --git a/test/unittests/util/file_hashes_test.py b/test/unittests/util/file_hashes_test.py index 403927373a0..b7ae5f0388a 100644 --- a/test/unittests/util/file_hashes_test.py +++ b/test/unittests/util/file_hashes_test.py @@ -3,8 +3,8 @@ from conan.tools.files import check_md5, check_sha1, check_sha256 from conans.errors import ConanException -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import save diff --git a/test/unittests/util/files/strip_root_extract_test.py b/test/unittests/util/files/strip_root_extract_test.py index 8196cd58813..1b8f8e5acc0 100644 --- a/test/unittests/util/files/strip_root_extract_test.py +++ b/test/unittests/util/files/strip_root_extract_test.py @@ -6,10 +6,10 @@ from conan.tools.files.files import untargz, unzip from conans.errors import ConanException from conans.model.manifest import gather_files -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.mocks import RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.mocks import RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output from conans.util.files import chdir, save from conans.util.files import gzopen_without_timestamps, rmdir diff --git a/test/unittests/util/files/tar_extract_test.py b/test/unittests/util/files/tar_extract_test.py index 3c10927a74c..28bfbbc617c 100644 --- a/test/unittests/util/files/tar_extract_test.py +++ b/test/unittests/util/files/tar_extract_test.py @@ -7,7 +7,7 @@ import pytest -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import tar_extract, gzopen_without_timestamps, save, gather_files, chdir diff --git a/test/unittests/util/files/test_dirty.py b/test/unittests/util/files/test_dirty.py index cbbe216da36..d263c6f33dc 100644 --- a/test/unittests/util/files/test_dirty.py +++ b/test/unittests/util/files/test_dirty.py @@ -4,7 +4,7 @@ import unittest -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import set_dirty, clean_dirty, set_dirty_context_manager, _DIRTY_FOLDER diff --git a/test/unittests/util/files/test_remove.py b/test/unittests/util/files/test_remove.py index 0cd28f3052b..93778e9ae6a 100644 --- a/test/unittests/util/files/test_remove.py +++ b/test/unittests/util/files/test_remove.py @@ -4,7 +4,7 @@ import stat import unittest -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import remove, save diff --git a/test/unittests/util/files_extract_wildcard_test.py b/test/unittests/util/files_extract_wildcard_test.py index 4acb0656454..48e05d56ec3 100644 --- a/test/unittests/util/files_extract_wildcard_test.py +++ b/test/unittests/util/files_extract_wildcard_test.py @@ -4,8 +4,8 @@ from unittest import TestCase from conan.tools.files import unzip -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import save_files diff --git a/test/unittests/util/local_db_test.py b/test/unittests/util/local_db_test.py index 650c6d414d6..fd1ff261fc2 100644 --- a/test/unittests/util/local_db_test.py +++ b/test/unittests/util/local_db_test.py @@ -2,7 +2,7 @@ import unittest from conans.client.store.localdb import LocalDB -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder class LocalStoreTest(unittest.TestCase): diff --git a/test/unittests/util/output_test.py b/test/unittests/util/output_test.py index 644c4360cb3..adf3d74c512 100644 --- a/test/unittests/util/output_test.py +++ b/test/unittests/util/output_test.py @@ -6,9 +6,9 @@ import pytest from conan.tools.files import unzip -from conans.test.utils.mocks import RedirectedTestOutput, ConanFileMock -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import TestClient, redirect_output +from conan.test.utils.mocks import RedirectedTestOutput, ConanFileMock +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import TestClient, redirect_output from conans.util.files import load, save diff --git a/test/unittests/util/tools_test.py b/test/unittests/util/tools_test.py index 11256a0b479..e71aa540e9e 100644 --- a/test/unittests/util/tools_test.py +++ b/test/unittests/util/tools_test.py @@ -9,9 +9,9 @@ from conan.tools.files import replace_in_file, collect_libs from conans.model.build_info import CppInfo from conans.model.layout import Infos -from conans.test.utils.mocks import ConanFileMock, RedirectedTestOutput -from conans.test.utils.test_files import temp_folder -from conans.test.utils.tools import redirect_output +from conan.test.utils.mocks import ConanFileMock, RedirectedTestOutput +from conan.test.utils.test_files import temp_folder +from conan.test.utils.tools import redirect_output from conans.util.env import get_env, environment_update from conans.util.files import load, md5, save from conans.util.runners import check_output_runner diff --git a/test/unittests/util/unix_path_test.py b/test/unittests/util/unix_path_test.py index 2db320b69c5..cd22fdfa6be 100644 --- a/test/unittests/util/unix_path_test.py +++ b/test/unittests/util/unix_path_test.py @@ -6,7 +6,7 @@ from conan.tools.microsoft.subsystems import subsystem_path from conans.client.subsystems import get_cased_path -from conans.test.utils.test_files import temp_folder +from conan.test.utils.test_files import temp_folder from conans.util.files import mkdir diff --git a/test/unittests/util/xz_test.py b/test/unittests/util/xz_test.py index dc8ceea9c6a..70729341084 100644 --- a/test/unittests/util/xz_test.py +++ b/test/unittests/util/xz_test.py @@ -2,8 +2,8 @@ import tarfile from conan.tools.files import unzip -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import load, save diff --git a/test/unittests/util/zip_permissions_test.py b/test/unittests/util/zip_permissions_test.py index 3e2184ee423..6b57465b03e 100644 --- a/test/unittests/util/zip_permissions_test.py +++ b/test/unittests/util/zip_permissions_test.py @@ -6,8 +6,8 @@ from unittest import TestCase from conan.tools.files import unzip -from conans.test.utils.mocks import ConanFileMock -from conans.test.utils.test_files import temp_folder +from conan.test.utils.mocks import ConanFileMock +from conan.test.utils.test_files import temp_folder from conans.util.files import save