Skip to content

Commit

Permalink
trying to fix is_test (#17338)
Browse files Browse the repository at this point in the history
* solve is_test bug

* fix
  • Loading branch information
memsharded authored Nov 21, 2024
1 parent 6e3d908 commit d5570c0
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CHECKSUM_DEPLOY = "checksum_deploy" # Only when v2
REVISIONS = "revisions" # Only when enabled in config, not by default look at server_launcher.py

__version__ = '2.9.2'
__version__ = '2.9.3'
2 changes: 1 addition & 1 deletion conans/model/requires.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ def aggregate(self, other):
self.transitive_libs = self.transitive_libs or other.transitive_libs
if not other.test:
self.test = False # it it was previously a test, but also required by non-test
# necessary even if no propagation, order of requires matter
self.is_test = self.is_test or other.is_test
# package_id_mode is not being propagated downstream. So it is enough to check if the
# current require already defined it or not
Expand Down Expand Up @@ -345,7 +346,6 @@ def transform_downstream(self, pkg_type, require, dep_pkg_type):

if self.test:
downstream_require.test = True
downstream_require.is_test = require.is_test

# If the current one is resolving conflicts, the downstream one will be too
downstream_require.force = require.force
Expand Down
44 changes: 44 additions & 0 deletions test/integration/graph/test_test_requires.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ def test_requires_transitive_diamond_components_order():
like the above, but in different order
libc --(test-requires)---> liba
|-----> libb -----------/
libc->liba => test=False, direct=True, is_test=True
direct_dependencies (components check) => False
https://github.com/conan-io/conan/issues/17164
"""
c = TestClient(light=True)
Expand Down Expand Up @@ -230,6 +232,48 @@ def package_info(self):
assert "libc/0.1: Created package" in c.out


def test_wrong_requirement_test_requires():
""" https://github.com/conan-io/conan/issues/17312
app --------> etas --------------> enum
\\-->hwinfo-/---(test_requires)---/
\\-----------------------------/
app->enum => test=False, direct=True, is_test=True
direct_dependencies (components check) => True
"""
c = TestClient(light=True)
app = textwrap.dedent("""
from conan import ConanFile
class Pkg(ConanFile):
name = "app"
version = "0.1"
requires = "etas/0.1", "enum/0.1", "hwinfo/0.1"
def generate(self):
for r, d in self.dependencies.items():
assert not (r.direct and r.is_test)
def package_info(self):
self.cpp_info.requires = ["etas::etas", "enum::enum", "hwinfo::hwinfo"]
""")
files = {
"enum/conanfile.py": GenConanfile("enum", "0.1"),
"etas/conanfile.py": GenConanfile("etas", "0.1").with_requirement("enum/0.1"),
"hwinfo/conanfile.py": GenConanfile("hwinfo", "0.1").with_requirement("etas/0.1")
.with_test_requires("enum/0.1"),
"app/conanfile.py": app,
}
c.save(files)
c.run("create enum")
c.run("create etas")
c.run("create hwinfo")
# The assert in generate() doesnt fail
c.run("install app")
# the package_info() doesn't fail
c.run("create app")


def test_test_requires_options():
""" the default_options = {} values also propagate to ``test_requires()`` """
c = TestClient(light=True)
Expand Down

0 comments on commit d5570c0

Please sign in to comment.