Skip to content

Commit 49486c7

Browse files
Youssef1313Youssef1313
committed
Unskip tests on macOS
1 parent 803c90b commit 49486c7

File tree

8 files changed

+64
-89
lines changed

8 files changed

+64
-89
lines changed

‎test/Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
<!-- Build & pack tests -->
77
<PropertyGroup>
88
<IsPackable>false</IsPackable>
9+
10+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
11+
<!-- But it works correctly on the dotnet process. -->
12+
<!-- So, disable apphost on macOS for now. -->
13+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
14+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
15+
916
<!-- Prevent arcade from adding Microsoft.NET.Test.Sdk -->
1017
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
1118
<PublishAot Condition=" '$(PublishAot)' == '' ">false</PublishAot>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/CrashDumpTests.cs‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ public sealed class CrashDumpTests : AcceptanceTestBase<CrashDumpTests.TestAsset
1010
[TestMethod]
1111
public async Task CrashDump_DefaultSetting_CreateDump(string tfm)
1212
{
13-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
14-
{
15-
// TODO: Investigate failures on macos
16-
return;
17-
}
18-
1913
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"));
2014
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "CrashDump", tfm);
2115
TestHostResult testHostResult = await testHost.ExecuteAsync($"--crashdump --results-directory {resultDirectory}", cancellationToken: TestContext.CancellationToken);
@@ -27,12 +21,6 @@ public async Task CrashDump_DefaultSetting_CreateDump(string tfm)
2721
[TestMethod]
2822
public async Task CrashDump_CustomDumpName_CreateDump()
2923
{
30-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
31-
{
32-
// TODO: Investigate failures on macos
33-
return;
34-
}
35-
3624
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"));
3725
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "CrashDump", TargetFrameworks.NetCurrent);
3826
TestHostResult testHostResult = await testHost.ExecuteAsync($"--crashdump --crashdump-filename customdumpname.dmp --results-directory {resultDirectory}", cancellationToken: TestContext.CancellationToken);
@@ -47,12 +35,6 @@ public async Task CrashDump_CustomDumpName_CreateDump()
4735
[TestMethod]
4836
public async Task CrashDump_Formats_CreateDump(string format)
4937
{
50-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
51-
{
52-
// TODO: Investigate failures on macos
53-
return;
54-
}
55-
5638
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"));
5739
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "CrashDump", TargetFrameworks.NetCurrent);
5840
TestHostResult testHostResult = await testHost.ExecuteAsync($"--crashdump --crashdump-type {format} --results-directory {resultDirectory}", cancellationToken: TestContext.CancellationToken);
@@ -92,7 +74,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
9274
<PropertyGroup>
9375
<TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
9476
<OutputType>Exe</OutputType>
95-
<UseAppHost>true</UseAppHost>
77+
78+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
79+
<!-- But it works correctly on the dotnet process. -->
80+
<!-- So, disable apphost on macOS for now. -->
81+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
82+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
83+
9684
<Nullable>enable</Nullable>
9785
<LangVersion>preview</LangVersion>
9886
</PropertyGroup>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/CrashPlusHangDumpTests.cs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ public sealed class CrashPlusHangDumpTests : AcceptanceTestBase<CrashPlusHangDum
99
[TestMethod]
1010
public async Task CrashPlusHangDump_InCaseOfCrash_CreateCrashDump()
1111
{
12-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
13-
{
14-
// TODO: Investigate failures on macos
15-
return;
16-
}
17-
1812
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), TargetFrameworks.NetCurrent);
1913
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "CrashPlusHangDump", TargetFrameworks.NetCurrent);
2014
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -38,12 +32,6 @@ public async Task CrashPlusHangDump_InCaseOfCrash_CreateCrashDump()
3832
[TestMethod]
3933
public async Task CrashPlusHangDump_InCaseOfHang_CreateHangDump()
4034
{
41-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
42-
{
43-
// TODO: Investigate failures on macos
44-
return;
45-
}
46-
4735
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), TargetFrameworks.NetCurrent);
4836
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "CrashPlusHangDump", TargetFrameworks.NetCurrent);
4937
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -85,7 +73,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
8573
<PropertyGroup>
8674
<TargetFramework>$TargetFrameworks$</TargetFramework>
8775
<OutputType>Exe</OutputType>
88-
<UseAppHost>true</UseAppHost>
76+
77+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
78+
<!-- But it works correctly on the dotnet process. -->
79+
<!-- So, disable apphost on macOS for now. -->
80+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
81+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
82+
8983
<Nullable>enable</Nullable>
9084
<LangVersion>preview</LangVersion>
9185
</PropertyGroup>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpOutputTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ public sealed class HangDumpOutputTests : AcceptanceTestBase<HangDumpOutputTests
1010
[TestMethod]
1111
public async Task HangDump_Outputs_HangingTests_EvenWhenHangingTestsHaveTheSameDisplayName(string format)
1212
{
13-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
14-
{
15-
// TODO: Investigate failures on macos
16-
return;
17-
}
18-
1913
// This test makes sure that when tests have the same display name (e.g. like Test1 from both Class1 and Class2)
2014
// they will still show up in the hanging tests. This was not the case before when we were just putting them into
2115
// a dictionary based on DisplayName. In that case both tests were started at the same time, and only 1 entry was added
@@ -56,7 +50,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
5650
<PropertyGroup>
5751
<TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
5852
<OutputType>Exe</OutputType>
59-
<UseAppHost>true</UseAppHost>
53+
54+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
55+
<!-- But it works correctly on the dotnet process. -->
56+
<!-- So, disable apphost on macOS for now. -->
57+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
58+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
59+
6060
<Nullable>enable</Nullable>
6161
<LangVersion>preview</LangVersion>
6262
</PropertyGroup>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpProcessTreeTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ public sealed class HangDumpProcessTreeTests : AcceptanceTestBase<HangDumpProces
1010
[TestMethod]
1111
public async Task HangDump_DumpAllChildProcesses_CreateDump(string tfm)
1212
{
13-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
14-
{
15-
// TODO: Investigate failures on macos
16-
return;
17-
}
18-
1913
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), tfm);
2014
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "HangDumpWithChild", tfm);
2115
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -52,7 +46,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
5246
<PropertyGroup>
5347
<TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
5448
<OutputType>Exe</OutputType>
55-
<UseAppHost>true</UseAppHost>
49+
50+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
51+
<!-- But it works correctly on the dotnet process. -->
52+
<!-- So, disable apphost on macOS for now. -->
53+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
54+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
55+
5656
<Nullable>enable</Nullable>
5757
<LangVersion>preview</LangVersion>
5858
</PropertyGroup>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpTests.cs‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ public sealed class HangDumpTests : AcceptanceTestBase<HangDumpTests.TestAssetFi
1010
[TestMethod]
1111
public async Task HangDump_DefaultSetting_CreateDump(string tfm)
1212
{
13-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
14-
{
15-
// TODO: Investigate failures on macos
16-
return;
17-
}
18-
1913
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), tfm);
2014
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "HangDump", tfm);
2115
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -34,12 +28,6 @@ public async Task HangDump_DefaultSetting_CreateDump(string tfm)
3428
[TestMethod]
3529
public async Task HangDump_CustomFileName_CreateDump()
3630
{
37-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
38-
{
39-
// TODO: Investigate failures on macos
40-
return;
41-
}
42-
4331
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), TargetFrameworks.NetCurrent);
4432
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "HangDump", TargetFrameworks.NetCurrent);
4533
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -57,12 +45,6 @@ public async Task HangDump_CustomFileName_CreateDump()
5745
[TestMethod]
5846
public async Task HangDump_PathWithSpaces_CreateDump()
5947
{
60-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
61-
{
62-
// TODO: Investigate failures on macos
63-
return;
64-
}
65-
6648
string resultDir = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), TargetFrameworks.NetCurrent);
6749
string resultDirectory = Path.Combine(resultDir, "directory with spaces");
6850
Directory.CreateDirectory(resultDirectory);
@@ -87,12 +69,6 @@ public async Task HangDump_PathWithSpaces_CreateDump()
8769
[TestMethod]
8870
public async Task HangDump_Formats_CreateDump(string format)
8971
{
90-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
91-
{
92-
// TODO: Investigate failures on macos
93-
return;
94-
}
95-
9672
string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), format);
9773
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "HangDump", TargetFrameworks.NetCurrent);
9874
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -149,7 +125,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
149125
<PropertyGroup>
150126
<TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
151127
<OutputType>Exe</OutputType>
152-
<UseAppHost>true</UseAppHost>
128+
129+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
130+
<!-- But it works correctly on the dotnet process. -->
131+
<!-- So, disable apphost on macOS for now. -->
132+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
133+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
134+
153135
<Nullable>enable</Nullable>
154136
<LangVersion>preview</LangVersion>
155137
</PropertyGroup>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/RetryFailedTestsTests.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,7 @@ public async Task RetryFailedTests_MaxTestsCount_Succeeds(string tfm, bool fail)
146146
// We use crash dump, not supported in NetFramework at the moment
147147
[DynamicData(nameof(TargetFrameworks.NetForDynamicData), typeof(TargetFrameworks))]
148148
public async Task RetryFailedTests_MoveFiles_Succeeds(string tfm)
149-
{
150-
// TODO: Crash dump is not working properly on macos, so we skip the test for now
151-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
152-
{
153-
return;
154-
}
155-
156-
await RetryHelper.RetryAsync(
149+
=> await RetryHelper.RetryAsync(
157150
async () =>
158151
{
159152
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, AssetName, tfm);
@@ -188,7 +181,6 @@ await RetryHelper.RetryAsync(
188181
Assert.Fail($"Expected 1 or 2 dump files, but found {dumpFilesCount}");
189182
}
190183
}, 3, TimeSpan.FromSeconds(5));
191-
}
192184

193185
[TestMethod]
194186
public async Task RetryFailedTests_PassingFromFirstTime_UsingTestTarget_MoveFiles_Succeeds()
@@ -235,7 +227,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
235227
<ImplicitUsings>enable</ImplicitUsings>
236228
<Nullable>enable</Nullable>
237229
<OutputType>Exe</OutputType>
238-
<UseAppHost>true</UseAppHost>
230+
231+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
232+
<!-- But it works correctly on the dotnet process. -->
233+
<!-- So, disable apphost on macOS for now. -->
234+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
235+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
236+
239237
<LangVersion>preview</LangVersion>
240238
<GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>
241239
<TestingPlatformCaptureOutput>false</TestingPlatformCaptureOutput>

‎test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ public async Task Trx_WhenReportTrxIsSpecified_TrxReportIsGeneratedInDefaultLoca
4040
[TestMethod]
4141
public async Task Trx_WhenTestHostCrash_ErrorIsDisplayedInsideTheTrx(string tfm)
4242
{
43-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
44-
{
45-
// TODO: Investigate failures on macos
46-
return;
47-
}
48-
4943
string fileName = Guid.NewGuid().ToString("N");
5044
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, TestAssetFixture.AssetName, tfm);
5145
TestHostResult testHostResult = await testHost.ExecuteAsync(
@@ -225,7 +219,13 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
225219
<ImplicitUsings>enable</ImplicitUsings>
226220
<Nullable>enable</Nullable>
227221
<OutputType>Exe</OutputType>
228-
<UseAppHost>true</UseAppHost>
222+
223+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
224+
<!-- But it works correctly on the dotnet process. -->
225+
<!-- So, disable apphost on macOS for now. -->
226+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
227+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
228+
229229
<LangVersion>preview</LangVersion>
230230
</PropertyGroup>
231231
<ItemGroup>
@@ -308,7 +308,13 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context)
308308
<ImplicitUsings>enable</ImplicitUsings>
309309
<Nullable>enable</Nullable>
310310
<OutputType>Exe</OutputType>
311-
<UseAppHost>true</UseAppHost>
311+
312+
<!-- Workaround: createdump doesn't work correctly on the apphost on macOS. -->
313+
<!-- But it works correctly on the dotnet process. -->
314+
<!-- So, disable apphost on macOS for now. -->
315+
<!-- Related: https://github.com/dotnet/runtime/issues/119945 -->
316+
<UseAppHost Condition="'$(OS)' == 'OSX'">false</UseAppHost>
317+
312318
<LangVersion>preview</LangVersion>
313319
<EnableMSTestRunner>true</EnableMSTestRunner>
314320
<GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>

0 commit comments

Comments
 (0)