Skip to content

Fixes #2081. Clipboard unit tests sometimes fail with WSL. #2082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2022
Merged

Fixes #2081. Clipboard unit tests sometimes fail with WSL. #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49eefa6
Fixes #2081. Clipboard unit tests sometimes fail with WSL.
BDisp Oct 12, 2022
da748f3
Merge branch 'develop' into wsl-clipboard-unit-tests-fix
BDisp Oct 19, 2022
ab9dc99
Merge branch 'develop' into wsl-clipboard-unit-tests-fix
tig Oct 20, 2022
54934cd
Added some documentation into the testenvironments.json file.
BDisp Oct 20, 2022
c3ff978
Merge branch 'develop' into wsl-clipboard-unit-tests-fix
BDisp Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,6 +1500,7 @@ protected override void SetClipboardDataImpl (string text)
}
}) {
powershell.Start ();
powershell.WaitForExit ();
if (!powershell.DoubleWaitForExit ()) {
var timeoutError = $@"Process timed out. Command line: bash {powershell.StartInfo.Arguments}.
Output: {powershell.StandardOutput.ReadToEnd ()}
Expand Down
3 changes: 2 additions & 1 deletion Terminal.Gui/Core/Clipboard/ClipboardBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public bool TrySetClipboardData (string text)
try {
SetClipboardDataImpl (text);
return true;
} catch (Exception) {
} catch (Exception ex) {
System.Diagnostics.Debug.WriteLine ($"TrySetClipboardData: {ex.Message}");
return false;
}
}
Expand Down
1 change: 1 addition & 0 deletions Terminal.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
.github\workflows\publish.yml = .github\workflows\publish.yml
README.md = README.md
testenvironments.json = testenvironments.json
EndProjectSection
EndProject
Global
Expand Down
19 changes: 19 additions & 0 deletions testenvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
// Remote Testing (experimental preview).
// Here is some documentation https://learn.microsoft.com/en-us/visualstudio/test/remote-testing?view=vs-2022.
// Here a screen shot of the VS2022 where are the Test Explorer https://user-images.githubusercontent.com/13117724/196798350-5a6f94d3-b6cd-424e-b4e8-a9b507dc057a.png.
// Ignore "Could not find 'mono' host" error because unit tests don't use the .NET Framework.
"version": "1",
"environments": [
{
"name": "WSL-Ubuntu",
"type": "wsl",
"wslDistribution": "Ubuntu"
},
{
"name": "WSL-Debian",
"type": "wsl",
"wslDistribution": "Debian"
}
]
}