From c5b0377adf73d329c2a4cf8f3bd66fef7aa8374b Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 23 Sep 2019 13:13:14 -0700 Subject: [PATCH 1/4] Install ptvsd wheels for all tests, not just functional --- build/ci/templates/test_phases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml index 1b4e9fd15657..0b22c60c38ce 100644 --- a/build/ci/templates/test_phases.yml +++ b/build/ci/templates/test_phases.yml @@ -145,7 +145,7 @@ steps: scriptPath: "./pythonFiles/install_ptvsd.py" arguments: "--ci" failOnStderr: true - condition: contains(variables['TestsToRun'], 'testUnitTests') + condition: eq(variables['NeedsPythonTestReqs'], 'true') # Run the Python unit tests in our codebase. Produces a JUnit-style log file that # will be uploaded after all tests are complete. From a8d37fe75173787f7f7328f4dfe0fc5895299491 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 23 Sep 2019 13:48:56 -0700 Subject: [PATCH 2/4] Only download wheels for Python 3.7 --- build/ci/templates/test_phases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml index 0b22c60c38ce..1025157386c3 100644 --- a/build/ci/templates/test_phases.yml +++ b/build/ci/templates/test_phases.yml @@ -145,7 +145,7 @@ steps: scriptPath: "./pythonFiles/install_ptvsd.py" arguments: "--ci" failOnStderr: true - condition: eq(variables['NeedsPythonTestReqs'], 'true') + condition: and(eq(variables['NeedsPythonTestReqs'], 'true'), (eq(variables['PythonVersion'], '3.7')) # Run the Python unit tests in our codebase. Produces a JUnit-style log file that # will be uploaded after all tests are complete. From 42b376998463ad9840e3f34acaab84c1eca7e8b6 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 23 Sep 2019 13:50:24 -0700 Subject: [PATCH 3/4] parenthesis --- build/ci/templates/test_phases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml index 1025157386c3..96203ae7074f 100644 --- a/build/ci/templates/test_phases.yml +++ b/build/ci/templates/test_phases.yml @@ -145,7 +145,7 @@ steps: scriptPath: "./pythonFiles/install_ptvsd.py" arguments: "--ci" failOnStderr: true - condition: and(eq(variables['NeedsPythonTestReqs'], 'true'), (eq(variables['PythonVersion'], '3.7')) + condition: and(eq(variables['NeedsPythonTestReqs'], 'true'), eq(variables['PythonVersion'], '3.7')) # Run the Python unit tests in our codebase. Produces a JUnit-style log file that # will be uploaded after all tests are complete. From 124ba8005d89dc735a16c06b039e3646db2e18b1 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 23 Sep 2019 14:47:31 -0700 Subject: [PATCH 4/4] Set pythonVersion for windows unit tests --- build/ci/vscode-python-pr-validation.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml index f3cd983bf235..a33caf7c9359 100644 --- a/build/ci/vscode-python-pr-validation.yaml +++ b/build/ci/vscode-python-pr-validation.yaml @@ -43,6 +43,7 @@ stages: # SkipXvfb: [true|false] - skip initialization of xvfb prior to running system tests on Linux. False if not set # UploadBinary: [true|false] - upload test binaries to Azure if true. False if not set. 'Win-Py3.7 Unit': + PythonVersion: '3.7' VMImageName: 'vs2017-win2016' TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools' NeedsPythonTestReqs: true