Skip to content
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

Tests | Split MultipleResultsTest, clean up console logging #3060

Merged
merged 8 commits into from
Mar 6, 2025
Merged

Tests | Split MultipleResultsTest, clean up console logging #3060

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43f0be1
Split MultipleResultsTest, clean up console logging
edwardneal Dec 4, 2024
1fcd48d
Further console logging disabled based on CI results.
edwardneal Dec 5, 2024
33c6cc7
Disabling TDSServer debug logging in one diagnostic test
edwardneal Dec 5, 2024
0c9c467
Remove CustomDeviceFlowCallback
edwardneal Feb 19, 2025
ee43e03
Early response to code review
edwardneal Feb 24, 2025
a896991
Merge branch 'main' into tests/console-logging
edwardneal Feb 24, 2025
29a3fa4
Checked use of Environment.NewLine
edwardneal Feb 24, 2025
f085005
Separated Assert.Throws call
edwardneal Feb 24, 2025
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: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public void CustomActiveDirectoryProviderTest_AppClientId_DeviceFlowCallback()

private Task CustomDeviceFlowCallback(DeviceCodeResult result)
Copy link
Contributor

Choose a reason for hiding this comment

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

It would help readability if we remove this method. It's not doing anything useful now that the logging is removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I've removed it. Can you trigger another CI run please?

{
Console.WriteLine(result.Message);
return Task.FromResult(0);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public async Task PreLoginEncryptionExcludedTest()
[PlatformSpecific(TestPlatforms.Windows)]
public async Task TransientFaultTestAsync(uint errorCode)
{
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, true, errorCode);
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, false, errorCode);
SqlConnectionStringBuilder builder = new()
{
DataSource = "localhost," + server.Port,
Expand All @@ -85,7 +85,7 @@ public async Task TransientFaultTestAsync(uint errorCode)
[PlatformSpecific(TestPlatforms.Windows)]
public void TransientFaultTest(uint errorCode)
{
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, true, errorCode);
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, false, errorCode);
SqlConnectionStringBuilder builder = new()
{
DataSource = "localhost," + server.Port,
Expand All @@ -112,7 +112,7 @@ public void TransientFaultTest(uint errorCode)
[PlatformSpecific(TestPlatforms.Windows)]
public void TransientFaultDisabledTestAsync(uint errorCode)
{
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, true, errorCode);
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, false, errorCode);
SqlConnectionStringBuilder builder = new()
{
DataSource = "localhost," + server.Port,
Expand All @@ -134,7 +134,7 @@ public void TransientFaultDisabledTestAsync(uint errorCode)
[PlatformSpecific(TestPlatforms.Windows)]
public void TransientFaultDisabledTest(uint errorCode)
{
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, true, errorCode);
using TransientFaultTDSServer server = TransientFaultTDSServer.StartTestServer(true, false, errorCode);
SqlConnectionStringBuilder builder = new()
{
DataSource = "localhost," + server.Port,
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/FunctionalTests/TestRoutingTdsServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static TestRoutingTdsServer StartTestServer(IPEndPoint destinationEndpoin
server._endpoint = new TDSServerEndPoint(server) { ServerEndPoint = new IPEndPoint(IPAddress.Any, 0) };
server._endpoint.EndpointName = methodName;
// The server EventLog should be enabled as it logs the exceptions.
server._endpoint.EventLog = Console.Out;
server._endpoint.EventLog = enableLog ? Console.Out : null;
server._endpoint.Start();

int port = server._endpoint.ServerEndPoint.Port;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/FunctionalTests/TestTdsServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static TestTdsServer StartServerWithQueryEngine(QueryEngine engine, bool
server._endpoint = new TDSServerEndPoint(server) { ServerEndPoint = new IPEndPoint(IPAddress.Any, 0) };
server._endpoint.EndpointName = methodName;
// The server EventLog should be enabled as it logs the exceptions.
server._endpoint.EventLog = Console.Out;
server._endpoint.EventLog = enableLog ? Console.Out : null;
server._endpoint.Start();

int port = server._endpoint.ServerEndPoint.Port;
Expand Down
5 changes: 0 additions & 5 deletions ...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>data.xml</Link>
</Content>
<Content Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.bsl">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>MultipleResultsTest.bsl</Link>
</Content>
<None Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.bsl" />
<None Include="SQL\ParameterTest\SqlParameterTest_DebugMode.bsl" />
<None Include="SQL\ParameterTest\SqlParameterTest_DebugMode_Azure.bsl" />
<None Include="SQL\ParameterTest\SqlParameterTest_ReleaseMode.bsl" />
Expand Down
47 changes: 0 additions & 47 deletions ....SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.bsl
View file
Open in desktop

This file was deleted.

Loading
Loading