fix tests

conan-io · Jan 14, 2025 · e61a04e · e61a04e
1 parent 3e4ad8e
commit e61a04e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/functional/toolchains/gnu/test_pkg_config.py b/test/functional/toolchains/gnu/test_pkg_config.py
@@ -33,7 +33,7 @@ def test_pc(self):
         conanfile = textwrap.dedent("""
             from conan import ConanFile
             from conan.tools.gnu import PkgConfig
-            from conans.model.build_info import CppInfo
+            from conan.tools import CppInfo
 
             class Pkg(ConanFile):
                 def generate(self):
@@ -42,7 +42,7 @@ def generate(self):
                     self.output.info(f"VERSION: {pkg_config.version}")
                     self.output.info(f"VARIABLES: {pkg_config.variables['prefix']}")
 
-                    cpp_info = CppInfo()
+                    cpp_info = CppInfo(self)
                     pkg_config.fill_cpp_info(cpp_info, is_system=False, system_libs=["m"])
 
                     assert cpp_info.includedirs == ['/usr/local/include/libastral']

diff --git a/test/integration/configuration/profile_test.py b/test/integration/configuration/profile_test.py
@@ -272,7 +272,7 @@ def test_info_with_profiles(self):
         self.client.run("remove '*' -c")
         # Create a simple recipe to require
         winreq_conanfile = '''
-from conans.model.conan_file import ConanFile
+from conan import ConanFile
 
 class winrequireDefaultNameConan(ConanFile):
     name = "winrequire"
@@ -286,7 +286,7 @@ class winrequireDefaultNameConan(ConanFile):
         self.client.run("export . --user=lasote --channel=stable")
 
         # Now require the first recipe depending on OS=windows
-        conanfile = '''from conans.model.conan_file import ConanFile
+        conanfile = '''from conan import ConanFile
 import os
 
 class DefaultNameConan(ConanFile):
@@ -339,7 +339,7 @@ class ProfileAggregationTest(unittest.TestCase):
     """)
 
     conanfile = dedent("""
-    from conans.model.conan_file import ConanFile
+    from conan import ConanFile
     import os
 
     class DefaultNameConan(ConanFile):
@@ -352,7 +352,7 @@ def build(self):
     """)
 
     consumer = dedent("""
-    from conans.model.conan_file import ConanFile
+    from conan import ConanFile
     import os
 
     class DefaultNameConan(ConanFile):