Fixes to CI (#5907)

Author: DonJayamanne

src/client/terminals/codeExecution/helper.ts

@@ -29,6 +29,9 @@ export class CodeExecutionHelper implements ICodeExecutionHelper {
             if (code.trim().length === 0) {
                 return '';
             }
+            // On windows cr is not handled well by python when passing in/out via stdin/stdout.
+            // So just remove cr from the input.
+            code = code.replace(new RegExp('\\r', 'g'), '');
             const pythonPath = this.configurationService.getSettings(resource).pythonPath;
             const args = [path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'normalizeForInterpreter.py'), code];
             const processService = await this.processServiceFactory.create(resource);

src/test/terminals/codeExecution/helper.test.ts

@@ -95,10 +95,7 @@ suite('Terminal - Code Execution Helper', () => {
         const doubleCrIndex = normalizedCode.indexOf('\r\r');
         expect(doubleCrIndex).to.be.equal(-1, 'Double CR (CRCRLF) line endings detected in normalized code snippet.');
     });
-    // https://github.com/microsoft/vscode-python/issues/5896
-    // https://dev.azure.com/ms/vscode-python/_build/results?buildId=18374&view=ms.vss-test-web.build-test-results-tab
-    // Remove '8' from the array.
-    ['', '1', '2', '3', '4', '5', '6', '7'].forEach(fileNameSuffix => {
+    ['', '1', '2', '3', '4', '5', '6', '7', '8'].forEach(fileNameSuffix => {
         test(`Ensure blank lines are removed (Sample${fileNameSuffix})`, async function () {
             // This test has not been working for many months in Python 2.7 under
             // Windows.Tracked by #2544.