Merge branch 'removeInterpreterTypes2' of github.com:microsoft/vscode…

…-jupyter into removeInterpreterTypes2 * 'removeInterpreterTypes2' of github.com:microsoft/vscode-jupyter: Force logging of tests output (#60)
microsoft · Sep 16, 2020 · 020c730 · 020c730
2 parents 78f8aab + b29a539
commit 020c730
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/insiders.yml b/.github/workflows/insiders.yml
@@ -19,6 +19,7 @@ env:
   ARTIFACT_NAME_VSIX: ms-ai-tools-jupyter-insiders-vsix
   VSIX_NAME: ms-ai-tools-jupyter-insiders.vsix
   COVERAGE_REPORTS: tests-coverage-reports
+  VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
   TEST_RESULTS_DIRECTORY: .
 
 jobs:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,7 +7,6 @@ on:
   check_run:
     types: [rerequested, requested_action]
 
-
 env:
   PYTHON_VERSION: 3.8
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
@@ -19,6 +18,7 @@ env:
   ARTIFACT_NAME_VSIX: ms-ai-tools-jupyter-insiders-vsix
   VSIX_NAME: ms-ai-tools-jupyter-insiders.vsix
   COVERAGE_REPORTS: tests-coverage-reports
+  VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
   TEST_RESULTS_DIRECTORY: .
 
 jobs:
@@ -118,7 +118,6 @@ jobs:
       - name: Check dependencies
         run: npm run checkDependencies
 
-
   ### Non-smoke tests
   ts_tests:
     name: Type Script Tests
@@ -231,10 +230,10 @@ jobs:
         with:
           node-version: ${{env.NODE_VERSION}}
 
-    #   - name: pip install ipython requirements
-    #     run: |
-    #       python -m pip install numpy
-    #     if: matrix.test-suite == 'python-unit'
+      #   - name: pip install ipython requirements
+      #     run: |
+      #       python -m pip install numpy
+      #     if: matrix.test-suite == 'python-unit'
 
       - name: Install functional test requirements
         run: |
@@ -249,33 +248,32 @@ jobs:
         shell: bash
         if: matrix.test-suite != 'ts-unit'
 
-    #   # Upload unit test coverage reports for later use in the "reports" job.
-    #   - name: Upload unit test coverage reports
-    #     uses: actions/upload-artifact@v1
-    #     with:
-    #       name: ${{runner.os}}-${{env.COVERAGE_REPORTS}}
-    #       path: .nyc_output
-    #     if: matrix.test-suite == 'ts-unit' && startsWith(matrix.python, 3.)
-
-    #   # Run the Python and IPython tests in our codebase.
-    #   - name: Run Python and IPython unit tests
-    #     run: |
-    #       python pythonFiles/tests/run_all.py
-    #       python -m IPython pythonFiles/tests/run_all.py
-    #     if: matrix.test-suite == 'python-unit'
-
-    #   - name: Run single-workspace tests
-    #     env:
-    #       CI_PYTHON_VERSION: ${{matrix.python}}
-    #     uses: GabrielBB/xvfb-action@v1.4
-    #     with:
-    #       run: npm run testSingleWorkspace
-    #     if: matrix.test-suite == 'single-workspace'
+      #   # Upload unit test coverage reports for later use in the "reports" job.
+      #   - name: Upload unit test coverage reports
+      #     uses: actions/upload-artifact@v1
+      #     with:
+      #       name: ${{runner.os}}-${{env.COVERAGE_REPORTS}}
+      #       path: .nyc_output
+      #     if: matrix.test-suite == 'ts-unit' && startsWith(matrix.python, 3.)
+
+      #   # Run the Python and IPython tests in our codebase.
+      #   - name: Run Python and IPython unit tests
+      #     run: |
+      #       python pythonFiles/tests/run_all.py
+      #       python -m IPython pythonFiles/tests/run_all.py
+      #     if: matrix.test-suite == 'python-unit'
+
+      #   - name: Run single-workspace tests
+      #     env:
+      #       CI_PYTHON_VERSION: ${{matrix.python}}
+      #     uses: GabrielBB/xvfb-action@v1.4
+      #     with:
+      #       run: npm run testSingleWorkspace
+      #     if: matrix.test-suite == 'single-workspace'
 
       - name: Run functional tests
         run: npm run test:functional
         if: matrix.test-suite == 'functional'
-
 #   smoke-tests:
 #     name: Smoke tests
 #     # The value of runs-on is the OS of the current job (specified in the strategy matrix below) instead of being hardcoded.