Fix daemons and path problems (#8994)

* Fix daemons and path problems * Skip stuff we don't need to get windows to run faster
microsoft · Feb 11, 2022 · 1548181 · 1548181
1 parent 96f8317
commit 1548181
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -527,27 +527,32 @@ jobs:
       # Used by tests for non-python kernels.
       # Test are enabled via env variable `VSC_JUPYTER_CI_RUN_NON_PYTHON_NB_TEST`
       - name: Install Julia
+        if: matrix.os != 'windows-latest'
         uses: julia-actions/setup-julia@v1
         with:
           version: ${{env.JULIA_VERSION}}
 
       - name: Install Julia Kernel
+        if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           julia -e '
             using Pkg
             Pkg.add("IJulia")'
 
       - name: Install Dot.net
+        if: matrix.os != 'windows-latest'
         uses: actions/[email protected]
         with:
           dotnet-version: ${{env.DOTNET_VERSION}}
 
       - name: Install .NET Interactive
+        if: matrix.os != 'windows-latest'
         shell: bash -l {0}
         run: dotnet tool install -g --add-source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" Microsoft.dotnet-interactive
 
       - name: Install .NET Kernel
+        if: matrix.os != 'windows-latest'
         shell: bash -l {0}
         run: dotnet interactive jupyter install
 

diff --git a/pythonFiles/vscode_datascience_helpers/jupyter_daemon.py b/pythonFiles/vscode_datascience_helpers/jupyter_daemon.py
@@ -17,7 +17,7 @@
 
 class PythonDaemon(BasePythonDaemon):
     def __init__(self, rx, tx, ppid):
-        super().__init__(rx, tx)
+        super().__init__(rx, tx, ppid)
         self.log.info("DataScience Daemon init")
 
     def __getitem__(self, item):

diff --git a/pythonFiles/vscode_datascience_helpers/kernel_interrupt_daemon.py b/pythonFiles/vscode_datascience_helpers/kernel_interrupt_daemon.py
@@ -16,7 +16,7 @@
 
 class PythonDaemon(JupyterDaemon):
     def __init__(self, rx, tx, ppid):
-        super().__init__(rx, tx)
+        super().__init__(rx, tx, ppid)
         self.log.info("DataScience Kernel Interrupt Daemon init: " + str(ppid))
         if sys.platform == "win32" and ppid != 0:
             self.initialize_interrupt(ppid)

diff --git a/pythonFiles/vscode_datascience_helpers/kernel_launcher_daemon.py b/pythonFiles/vscode_datascience_helpers/kernel_launcher_daemon.py
@@ -24,7 +24,7 @@
 
 class PythonDaemon(JupyterDaemon):
     def __init__(self, rx, tx, ppid):
-        super().__init__(rx, tx)
+        super().__init__(rx, tx, ppid)
         self.killing_kernel = False
         self.log.info("DataScience Kernel Launcher Daemon init")
 

diff --git a/src/test/datascience/notebook/executionService.vscode.test.ts b/src/test/datascience/notebook/executionService.vscode.test.ts
@@ -1085,7 +1085,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
                         import time
                         import os.path
                         from os import path
-                        while os.path.exists('${tmpFile}'):
+                        while os.path.exists('${tmpFile.replace(/\\/g, '\\\\')}'):
                             time.sleep(0.1)
 
                         print("End Cell ${index}")`,