development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 14:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211873 from microsoft/tyriar/mac_linux_test

Browse source 
Enable suggest tests on mac and Linux
This commit is contained in:
Daniel Imms 2024-05-02 13:17:29 -07:00 committed by GitHub
parent 0a4b2fc292 9ca0d8ad8c
commit 961d4ad47b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
View file

@ -21,7 +21,6 @@ import { TerminalSuggestCommandId } from 'vs/workbench/contrib/terminalContrib/s
import type { ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; import type { ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices'; import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { isWindows } from 'vs/base/common/platform';
import { events as windows11_pwsh_getcontent_delete_ghost } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_delete_ghost'; import { events as windows11_pwsh_getcontent_delete_ghost } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_delete_ghost';
import { events as windows11_pwsh_getcontent_file } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file'; import { events as windows11_pwsh_getcontent_file } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file';
import { events as windows11_pwsh_input_ls_complete_ls } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls'; import { events as windows11_pwsh_input_ls_complete_ls } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls';
@ -52,8 +51,7 @@ interface IRecordedSessionResizeEvent {
rows: number; rows: number;
} }
// DEBT: It's not clear why this doesn't play nicely on Linux suite('Terminal Contrib Suggest Recordings', () => {
(isWindows ? suite : suite.skip)('Terminal Contrib Suggest Recordings', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite(); const store = ensureNoDisposablesAreLeakedInTestSuite();
let xterm: Terminal; let xterm: Terminal;
@ -113,10 +111,8 @@ interface IRecordedSessionResizeEvent {
} }
case 'output': { case 'output': {
await new Promise<void>(r => xterm.write(event.data, () => r())); await new Promise<void>(r => xterm.write(event.data, () => r()));
// HACK: On Windows if the output contains the command start sequence, allow time for the // If the output contains the command start sequence, allow time for the prompt to get adjusted.
// prompt to get adjusted. Eventually we should be able to remove this, but right now if (event.data.includes('\x1b]633;B')) {
// a pause is required.
if (isWindows && event.data.includes('\x1b]633;B')) {
const commandDetection = capabilities.get(TerminalCapability.CommandDetection); const commandDetection = capabilities.get(TerminalCapability.CommandDetection);
if (commandDetection) { if (commandDetection) {
await new Promise<void>(r => { await new Promise<void>(r => {