Skip to content

Ignore SendMessageTimeout failures on Windows Nano Server #80099

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 2 commits into from
Jan 3, 2023
Merged

Ignore SendMessageTimeout failures on Windows Nano Server #80099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ce5d0
Ignore SendMessageTimeout failures on Windows Nano Server
jkotas Jan 2, 2023
2f95a3f
Fix tests
jkotas Jan 2, 2023
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
4 changes: 3 additions & 1 deletion src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ private static void SetEnvironmentVariableFromRegistry(string variable, string?
{
IntPtr unused;
IntPtr r = Interop.User32.SendMessageTimeout(new IntPtr(Interop.User32.HWND_BROADCAST), Interop.User32.WM_SETTINGCHANGE, IntPtr.Zero, (IntPtr)lParam, 0, 1000, &unused);
Debug.Assert(r != IntPtr.Zero, $"SetEnvironmentVariable failed: {Marshal.GetLastPInvokeError()}");

// SendMessageTimeout message is a empty stub on Windows Nano Server that fails with both result and last error 0.
Debug.Assert(r != IntPtr.Zero || Marshal.GetLastPInvokeError() == 0, $"SetEnvironmentVariable failed: {Marshal.GetLastPInvokeError()}");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ public void EnumerateEnvironmentVariables(EnvironmentVariableTarget target)
bool lookForSetValue = (target == EnvironmentVariableTarget.Process)
|| (PlatformDetection.IsWindows && PlatformDetection.IsPrivilegedProcess);

// [ActiveIssue("https://github.com/dotnet/runtime/issues/30566")]
if (PlatformDetection.IsWindowsNanoServer && target == EnvironmentVariableTarget.User)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this has to stay in SetEnvironmentVariable?

runtime/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs

Line 19 in 5553691

// [ActiveIssue("https://github.com/dotnet/runtime/issues/30566")]

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually I think that should be removed

runtime/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs

Lines 19 to 23 in 5553691

// [ActiveIssue("https://github.com/dotnet/runtime/issues/30566")]
if (target == EnvironmentVariableTarget.User && PlatformDetection.IsWindowsNanoServer)
{
return false;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I thought setting per-user env vars worked, but only for the current process. So these two tests ought to pass, as it's all in the same process. You've made them skip though?

if (target == EnvironmentVariableTarget.User && PlatformDetection.IsWindowsNanoServer)
{
// Windows Nano Server does not have full per-user registry hives
lookForSetValue = false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public class SetEnvironmentVariable

internal static bool IsSupportedTarget(EnvironmentVariableTarget target)
{
// [ActiveIssue("https://github.com/dotnet/runtime/issues/30566")]
if (target == EnvironmentVariableTarget.User && PlatformDetection.IsWindowsNanoServer)
{
// Windows Nano Server does not have full per-user registry hives
return false;
}

Expand Down
4 changes: 0 additions & 4 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,6 @@
<!-- https://github.com/dotnet/runtime/issues/72908 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />

<!-- https://github.com/dotnet/runtime/issues/30566 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Extensions\tests\System.Runtime.Extensions.Tests.csproj"
Condition="'$(RuntimeConfiguration)' == 'checked' and '$(TargetOS)' == 'windows'" />

<!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"
Condition="'$(TargetOS)' != 'windows'" />
Expand Down