Skip to content

Commit a2301ec

Browse files
authored
Move test_requires to build_requirements in tests (conan-io#18929)
* move test_requires to build_requirements * wip * leave 1 in requirements
1 parent fbe948d commit a2301ec

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

test/functional/toolchains/microsoft/test_msbuilddeps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ class HelloConan(ConanFile):
833833
settings = "os", "build_type", "compiler", "arch"
834834
generators = "MSBuildDeps", "MSBuildToolchain"
835835
836-
def requirements(self):
836+
def build_requirements(self):
837837
self.test_requires("mydep.pkg.team/0.1")
838838
839839
def build(self):

test/integration/graph/test_test_requires.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ def test_test_requires_half_diamond_change_order(self):
3535
from conan import ConanFile
3636
class Pkg(ConanFile):
3737
def requirements(self):
38+
# Best practice is to declare test_requires in the build_requirements() method,
39+
# but this ensures it is also possible to declare them in requirements(),
40+
# as has historically been allowed.
3841
self.test_requires("gtest/1.0")
3942
self.requires("zlib/1.0")
4043
""")
@@ -70,8 +73,9 @@ def test_test_requires_diamond_change_order(self):
7073
game = textwrap.dedent("""
7174
from conan import ConanFile
7275
class Pkg(ConanFile):
73-
def requirements(self):
76+
def build_requirements(self):
7477
self.test_requires("gtest/1.0")
78+
def requirements(self):
7579
self.requires("engine/1.0")
7680
""")
7781
c.save({"zlib/conanfile.py": GenConanfile("zlib", "1.0"),
@@ -92,7 +96,7 @@ def test_test_requires_conflict_force(self):
9296
game = textwrap.dedent("""
9397
from conan import ConanFile
9498
class Pkg(ConanFile):
95-
def requirements(self):
99+
def build_requirements(self):
96100
self.test_requires("gtest/1.0", force=True)
97101
self.test_requires("rapidcheck/1.0")
98102
""")
@@ -214,8 +218,9 @@ class LibC(ConanFile):
214218
name = "libc"
215219
version = "0.1"
216220
217-
def requirements(self):
221+
def build_requirements(self):
218222
self.test_requires("liba/1.0")
223+
def requirements(self):
219224
self.requires("libb/1.0")
220225
221226
def package_info(self):

0 commit comments

Comments
 (0)