Skip to content

Commit 5b3c4fb

Browse files
Update condition
Require administrator if on Windows, rather than require administrator and Windows.
1 parent 2f6a856 commit 5b3c4fb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

test/IntegrationTests/WcfTestsBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ protected virtual void Dispose(bool disposing)
6262

6363
protected async Task SubmitsTracesInternal(string clientPackageVersion, WcfServerTestHelperBase wcfServerTestHelperBase)
6464
{
65-
Assert.True(!EnvironmentTools.IsWindows() || EnvironmentTools.IsWindowsAdministrator(), "This test requires Windows Administrator privileges.");
6665
#if NET
6766
Assert.NotNull(wcfServerTestHelperBase);
6867
#else

test/IntegrationTests/WindowsAdministratorFactAttribute.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public sealed class WindowsAdministratorFactAttribute : FactAttribute
1111
public WindowsAdministratorFactAttribute()
1212
: base()
1313
{
14-
Skip = EnvironmentTools.IsWindowsAdministrator() ? null : "This test requires Windows Administrator privileges.";
14+
Skip = GetSkipReason();
1515
}
16+
17+
internal static string? GetSkipReason() =>
18+
!EnvironmentTools.IsWindows() || EnvironmentTools.IsWindowsAdministrator() ? null : "This test requires administrative privileges on Windows.";
1619
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
using IntegrationTests.Helpers;
5-
64
namespace IntegrationTests;
75

86
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
@@ -11,6 +9,6 @@ public sealed class WindowsAdministratorTheoryAttribute : TheoryAttribute
119
public WindowsAdministratorTheoryAttribute()
1210
: base()
1311
{
14-
Skip = EnvironmentTools.IsWindowsAdministrator() ? null : "This test requires Windows Administrator privileges.";
12+
Skip = WindowsAdministratorFactAttribute.GetSkipReason();
1513
}
1614
}

0 commit comments

Comments
 (0)