Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrennan Conroy <brecon@microsoft.com>2022-06-25 02:33:10 +0300
committerBrennan Conroy <brecon@microsoft.com>2022-06-25 02:33:10 +0300
commit21b76aaf82481c1751105a3e8c3d78b7288104f2 (patch)
treee4fa67d6a3ebf5845f73a2ba20106ba17571b118
parentff873a58981aef5ecd1c70697aed83aaf6858a80 (diff)
Small test assert changes for flaky testsbrecon/nit
-rw-r--r--src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs4
-rw-r--r--src/Hosting/Hosting/test/HostingApplicationTests.cs4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index c902bb1d59..be105ab922 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using System.Net.Http;
@@ -126,7 +126,7 @@ public class WebHostFunctionalTests : LoggedTest
logger.Log(LogLevel.Information, 0, "Message", null, (s, e) =>
{
- Assert.True(false);
+ Assert.True(false, "Information log when log level set to warning in config");
return string.Empty;
});
diff --git a/src/Hosting/Hosting/test/HostingApplicationTests.cs b/src/Hosting/Hosting/test/HostingApplicationTests.cs
index 94761ed5ee..3d263e0948 100644
--- a/src/Hosting/Hosting/test/HostingApplicationTests.cs
+++ b/src/Hosting/Hosting/test/HostingApplicationTests.cs
@@ -115,6 +115,8 @@ public class HostingApplicationTests
using var _ = dummySource.StartActivity("DummyActivity");
Assert.Same(initialActivity, activityFeature.Activity);
+ Assert.Null(activityFeature.Activity.ParentId);
+ Assert.Equal(activityFeature.Activity.Id, Activity.Current.ParentId);
Assert.NotEqual(Activity.Current, activityFeature.Activity);
// Act/Assert
@@ -156,6 +158,8 @@ public class HostingApplicationTests
using var _ = dummySource.StartActivity("DummyActivity");
Assert.Same(initialActivity, activityFeature.Activity);
+ Assert.Null(activityFeature.Activity.ParentId);
+ Assert.Equal(activityFeature.Activity.Id, Activity.Current.ParentId);
Assert.NotEqual(Activity.Current, activityFeature.Activity);
// Act/Assert