MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

terminal: disable oh-my-zsh update prompt in tests

Browse Source 
The prompt "[oh-my-zsh] Would you like to update? [Y/n]" requires user input, so test execution is blocked.
Steps to reproduce: https://youtrack.jetbrains.com/issue/IDEA-315743/Create-a-block-for-New-Terminal-output-that-is-shown-on-terminal-session-start-before-prompt-is-shown#focus=Comments-27-7257411.0-0

GitOrigin-RevId: 90602755f45fd2992cd565b757d875318efbb0df
This commit is contained in:
Sergey Simonchik
2023-12-10 12:44:22 +00:00
committed by intellij-monorepo-bot
parent c0162cd8fd
commit 24cd0a3f63
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+3 -2
View File
@@ -142,7 +142,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
return new LocalTerminalDirectRunner(project);
}
private @NotNull Map<String, String> getTerminalEnvironment(@NotNull String workingDir) {
private @NotNull Map<String, String> getTerminalEnvironment(@NotNull Map<String, String> patchEnvs, @NotNull String workingDir) {
Map<String, String> envs = SystemInfo.isWindows ? CollectionFactory.createCaseInsensitiveStringMap() : new HashMap<>();
EnvironmentVariablesData envData = TerminalProjectOptionsProvider.getInstance(myProject).getEnvData();
if (envData.isPassParentEnvs()) {
@@ -153,6 +153,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
LOG.info("No parent environment passed");
}
envs.putAll(patchEnvs);
if (!SystemInfo.isWindows) {
envs.put("TERM", "xterm-256color");
}
@@ -187,7 +188,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
@Override
public @NotNull ShellStartupOptions configureStartupOptions(@NotNull ShellStartupOptions baseOptions) {
String workingDir = getWorkingDirectory(baseOptions.getWorkingDirectory());
Map<String, String> envs = getTerminalEnvironment(workingDir);
Map<String, String> envs = getTerminalEnvironment(baseOptions.getEnvVariables(), workingDir);
List<String> initialCommand = doGetInitialCommand(baseOptions, envs);
TerminalWidget widget = baseOptions.getWidget();
plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/util/TerminalSessionTestUtil.kt
+4 -1
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.registry.Registry
import com.intellij.testFramework.fixtures.BasePlatformTestCase
import com.intellij.util.EnvironmentUtil
import com.intellij.util.execution.ParametersListUtil
import com.jediterm.core.util.TermSize
import com.jediterm.terminal.RequestOrigin
@@ -33,7 +34,9 @@ object TerminalSessionTestUtil {
Registry.get(LocalBlockTerminalRunner.BLOCK_TERMINAL_FISH_REGISTRY).setValue(true, parentDisposable)
Registry.get(LocalBlockTerminalRunner.BLOCK_TERMINAL_POWERSHELL_REGISTRY).setValue(true, parentDisposable)
val runner = LocalBlockTerminalRunner(project)
val baseOptions = ShellStartupOptions.Builder().shellCommand(listOf(shellPath)).initialTermSize(initialTermSize).build()
val baseOptions = ShellStartupOptions.Builder().shellCommand(listOf(shellPath)).initialTermSize(initialTermSize)
.envVariables(mapOf(EnvironmentUtil.DISABLE_OMZ_AUTO_UPDATE to "true"))
.build()
val configuredOptions = runner.configureStartupOptions(baseOptions)
assumeBlockShellIntegration(configuredOptions)
val process = runner.createProcess(configuredOptions)