From edd6fc5a091a13747662b6da35319edb6e2d86d1 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Sat, 1 Sep 2018 12:47:16 +0200 Subject: [PATCH 1/2] call the function! --- conans/test/util/tools_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conans/test/util/tools_test.py b/conans/test/util/tools_test.py index 11010c79cac..d6858d00ae5 100644 --- a/conans/test/util/tools_test.py +++ b/conans/test/util/tools_test.py @@ -1044,7 +1044,7 @@ def get_values(this_os, this_arch, setting_os, setting_arch, compiler=None): def detect_windows_subsystem_test(self): # Dont raise test result = tools.os_info.detect_windows_subsystem() - if not tools.os_info.bash_path or platform.system() != "Windows": + if not tools.os_info.bash_path() or platform.system() != "Windows": self.assertEqual(None, result) else: self.assertEqual(str, type(result)) From b38179fe2aa607f0b18215a45c7afc723691d728 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Mon, 3 Sep 2018 11:31:53 +0200 Subject: [PATCH 2/2] patch OSInfo.bash_path function call --- conans/test/util/tools_test.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/conans/test/util/tools_test.py b/conans/test/util/tools_test.py index d6858d00ae5..d60c3365c2d 100644 --- a/conans/test/util/tools_test.py +++ b/conans/test/util/tools_test.py @@ -827,10 +827,11 @@ def __call__(self, command, output, log_filepath=None, self._runner = MyRun() conanfile = MockConanfile() - tools.run_in_windows_bash(conanfile, "a_command.bat", subsystem="cygwin") - self.assertIn("bash", conanfile._runner.command) - self.assertIn("--login -c", conanfile._runner.command) - self.assertIn("^&^& a_command.bat ^", conanfile._runner.command) + with patch.object(OSInfo, "bash_path", return_value='bash'): + tools.run_in_windows_bash(conanfile, "a_command.bat", subsystem="cygwin") + self.assertIn("bash", conanfile._runner.command) + self.assertIn("--login -c", conanfile._runner.command) + self.assertIn("^&^& a_command.bat ^", conanfile._runner.command) with tools.environment_append({"CONAN_BASH_PATH": "path\\to\\mybash.exe"}): tools.run_in_windows_bash(conanfile, "a_command.bat", subsystem="cygwin") @@ -842,10 +843,11 @@ def __call__(self, command, output, log_filepath=None, # try to append more env vars conanfile = MockConanfile() - tools.run_in_windows_bash(conanfile, "a_command.bat", subsystem="cygwin", env={"PATH": "/other/path", - "MYVAR": "34"}) - self.assertIn('^&^& PATH=\\^"/cygdrive/other/path:/cygdrive/path/to/somewhere:$PATH\\^" ' - '^&^& MYVAR=34 ^&^& a_command.bat ^', conanfile._runner.command) + with patch.object(OSInfo, "bash_path", return_value='bash'): + tools.run_in_windows_bash(conanfile, "a_command.bat", subsystem="cygwin", + env={"PATH": "/other/path", "MYVAR": "34"}) + self.assertIn('^&^& PATH=\\^"/cygdrive/other/path:/cygdrive/path/to/somewhere:$PATH\\^" ' + '^&^& MYVAR=34 ^&^& a_command.bat ^', conanfile._runner.command) def download_retries_test(self): http_server = StoppableThreadBottle()