Merge branch 'main' into far-hyena

Author: eleanorjboyd

python_files/tests/pytestadapter/.data/coverage_w_config/pyproject.toml

@@ -2,4 +2,4 @@
 # Licensed under the MIT License.
 
 [tool.coverage.report]
-omit = ["test_ignore.py"]
+omit = ["test_ignore.py", "tests/*.py"]

python_files/tests/pytestadapter/.data/coverage_w_config/tests/test_disregard.py

@@ -0,0 +1,5 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+def test_i_hope_this_is_ignored():
+    assert True

python_files/tests/pytestadapter/test_coverage.py

@@ -101,11 +101,14 @@ def test_coverage_w_omit_config():
     │   ├── test_ignore.py
     │   ├── test_ran.py
     │   └── pyproject.toml
+    │   ├── tests
+    │   │   └── test_disregard.py
 
     pyproject.toml file with the following content:
     [tool.coverage.report]
     omit = [
         "test_ignore.py",
+        "tests/*.py" (this will ignore the coverage in the file tests/test_disregard.py)
     ]
 
 

python_files/vscode_pytest/__init__.py

@@ -453,11 +453,11 @@ def pytest_sessionfinish(session, exitstatus):
         # remove files omitted per coverage report config if any
         omit_files = cov.config.report_omit
         if omit_files:
-            omit_files = set(omit_files)
-            # convert to absolute paths, check against file set
-            omit_files = {os.fspath(pathlib.Path(file).absolute()) for file in omit_files}
-            print("Files to omit from reporting", omit_files)
-            file_set = file_set - omit_files
+            print("Plugin info[vscode-pytest]: Omit files/rules: ", omit_files)
+            for pattern in omit_files:
+                for file in list(file_set):
+                    if pathlib.Path(file).match(pattern):
+                        file_set.remove(file)
 
         for file in file_set:
             try:

src/client/common/pipes/namedPipes.ts

@@ -12,6 +12,7 @@ import { CancellationError, CancellationToken, Disposable } from 'vscode';
 import { traceVerbose } from '../../logging';
 import { isWindows } from '../utils/platform';
 import { createDeferred } from '../utils/async';
+import { noop } from '../utils/misc';
 
 const { XDG_RUNTIME_DIR } = process.env;
 export function generateRandomPipeName(prefix: string): string {
@@ -187,6 +188,13 @@ export async function createReaderPipe(pipeName: string, token?: CancellationTok
     } catch {
         // Intentionally ignored
     }
-    const reader = fs.createReadStream(pipeName, { encoding: 'utf-8' });
-    return new rpc.StreamMessageReader(reader, 'utf-8');
+    const fd = await fs.open(pipeName, fs.constants.O_RDONLY | fs.constants.O_NONBLOCK);
+    const socket = new net.Socket({ fd });
+    const reader = new rpc.SocketMessageReader(socket, 'utf-8');
+    socket.on('close', () => {
+        fs.close(fd).catch(noop);
+        reader.dispose();
+    });
+
+    return reader;
 }

src/client/repl/replController.ts

@@ -11,7 +11,6 @@ export function createReplController(
 
     const controller = vscode.notebooks.createNotebookController('pythonREPL', 'jupyter-notebook', 'Python REPL');
     controller.supportedLanguages = ['python'];
-    controller.supportsExecutionOrder = true;
 
     controller.description = 'Python REPL';
 

src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts

@@ -127,6 +127,7 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
                         traceError(
                             `Subprocess exited unsuccessfully with exit code ${code} and signal ${signal} on workspace ${uri.fsPath}`,
                         );
+                        this.resultResolver?.resolveDiscovery(createDiscoveryErrorPayload(code, signal, cwd));
                     }
                     deferredTillExecClose.resolve();
                 });