From f6b0c135ce2d925666dda99bce4e1f744d3c3b51 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 6 Dec 2019 13:26:50 -0800 Subject: [PATCH 1/2] Create an actual environment for python healthy() types test --- tests/languages/python_test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/languages/python_test.py b/tests/languages/python_test.py index 7daff1d4..55854a8a 100644 --- a/tests/languages/python_test.py +++ b/tests/languages/python_test.py @@ -54,7 +54,11 @@ def test_find_by_sys_executable(exe, realpath, expected): def test_healthy_types_py_in_cwd(tmpdir): with tmpdir.as_cwd(): + prefix = tmpdir.join('prefix').ensure_dir() + prefix.join('setup.py').write('import setuptools; setuptools.setup()') + prefix = Prefix(str(prefix)) + python.install_environment(prefix, C.DEFAULT, ()) + # even if a `types.py` file exists, should still be healthy tmpdir.join('types.py').ensure() - # this env doesn't actually exist (for test speed purposes) - assert python.healthy(Prefix(str(tmpdir)), C.DEFAULT) is True + assert python.healthy(prefix, C.DEFAULT) is True From 2cff185c00540cb7a5d305db5e1726a4aad0cd1a Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 6 Dec 2019 13:35:28 -0800 Subject: [PATCH 2/2] Revert "Fix step template breakage" This reverts commit dc612f0219a6c919b4f5a9be18c43b4b3ddce99a. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e797b0c8..5b57e894 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,7 +29,7 @@ jobs: name_postfix: _latest_git pre_test: - task: UseRubyVersion@0 - - template: step--git-install.yml@asottile + - template: step--git-install.yml - bash: | testing/get-swift.sh echo '##vso[task.prependpath]/tmp/swift/usr/bin'