Skip to content

Commit

Permalink
Merge branch 'release/0.16.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed Dec 5, 2016
2 parents 0b2d669 + 9fd844e commit 69f6980
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
from conans.util.files import load
import os

__version__ = '0.16.0'
__version__ = '0.16.1'

3 changes: 2 additions & 1 deletion conans/client/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ def test_package(self, *args):
env = profile.env
package_env = profile.package_env

loader = manager._loader(None, settings, options, scopes, package_settings, env, package_env)
loader = manager._loader(current_path=None, user_settings_values=settings, user_options_values=options,
scopes=scopes, package_settings=package_settings, env=env, package_env=package_env)
conanfile = loader.load_conan(test_conanfile, self._user_io.out, consumer=True)
try:
# convert to list from ItemViews required for python3
Expand Down
27 changes: 27 additions & 0 deletions conans/test/integration/conan_test_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,33 @@
@attr("slow")
class ConanTestTest(unittest.TestCase):

def scopes_test_package_test(self):
client = TestClient()
conanfile = """
from conans import ConanFile
class HelloConan(ConanFile):
name = "Hello"
version = "0.1"
def build(self):
self.output.info("Scope: %s" % self.scope)
"""
test_conanfile = """
from conans import ConanFile, CMake
import os
class HelloReuseConan(ConanFile):
requires = "Hello/0.1@lasote/stable"
def test(self):
self.conanfile_directory
"""
client.save({"conanfile.py": conanfile,
"test/conanfile.py": test_conanfile})
client.run("test_package --scope Hello:dev=True --build=missing")
self.assertIn("Hello/0.1@lasote/stable: Scope: dev=True", client.user_io.out)

def fail_test_package_test(self):
client = TestClient()
conanfile = """
Expand Down

0 comments on commit 69f6980

Please sign in to comment.