Skip to content

Enable Diagnostic Source tests with remote executor #517

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 12 commits into from
Apr 13, 2020
Merged

Enable Diagnostic Source tests with remote executor #517

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
25eb207
Remote Executor for Diagnostic Source/Add more tests for EventSource
Apr 7, 2020
b351797
Remote
Apr 7, 2020
50e6a4c
RemoteExecutor Improved
Apr 7, 2020
b6752e2
Improved
Apr 7, 2020
e7bb340
improved.
Apr 7, 2020
7282243
EventSource improvment
Apr 7, 2020
5d489f9
EventSource
Apr 7, 2020
444db19
improved
Apr 7, 2020
8747781
Diagnostic source
Apr 8, 2020
3e8eb18
Tracing
Apr 8, 2020
7a65fbe
Add Test path to csproj.
Apr 9, 2020
ef69135
update nuget config
Apr 9, 2020
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
8 changes: 1 addition & 7 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<Compile Include="SqlConnectionBasicTests.cs" />
<Compile Include="SqlCommandTest.cs" />
<Compile Include="SqlConnectionTest.cs" />
<Compile Include="TestTdsServer.cs" />
<Compile Include="AADAccessTokenTest.cs" />
<Compile Include="CloneTests.cs" />
<Compile Include="BaseProviderAsyncTest\BaseProviderAsyncTest.cs" />
Expand All @@ -43,11 +42,10 @@
<Compile Include="SqlBulkCopyColumnMappingCollectionTest.cs" />
<Compile Include="AmbientTransactionFailureTest.cs" />
<Compile Include="SqlConnectionTest.RetrieveStatistics.cs" />
<Compile Include="FakeDiagnosticListenerObserver.cs" />
<Compile Include="SqlMetaDataTest.cs" />
<Compile Include="SqlConnectionStringBuilderTest.cs" />
<Compile Include="SerializeSqlTypesTest.cs" />
<!-- <Compile Include="DiagnosticTest.cs" /> -->
<Compile Include="TestTdsServer.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
Expand Down Expand Up @@ -82,10 +80,6 @@
</ProjectReference>
<ProjectReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
<ProjectReference Condition="'$(TargetGroup)'=='netfx'" Include="$(NetFxSource)src\Microsoft.Data.SqlClient.csproj" />
<!-- <ProjectReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> -->
<!-- <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> -->
<!-- <Name>RemoteExecutorConsoleApp</Name> -->
<!-- </ProjectReference > -->
</ItemGroup>
<ItemGroup>
<None Condition="'$(TargetGroup)'=='netfx'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\**\SNI.dll" CopyToOutputDirectory="PreserveNewest" />
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,15 @@ public static string RetrieveValueFromConnStr(string connStr, string[] keywords)
public class TraceEventListener : EventListener
{
public List<int> IDs = new List<int>();
public EventSource EventSourceProperty;

protected override void OnEventSourceCreated(EventSource eventSource)
{
if (eventSource.Name.Equals("Microsoft.Data.SqlClient.EventSource"))
{
// Collect all traces for better code coverage
EnableEvents(eventSource, EventLevel.Informational, EventKeywords.All);
EventSourceProperty = eventSource;
}
}

Expand Down
9 changes: 8 additions & 1 deletion ...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 @@ -59,7 +59,9 @@
<Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
<Compile Include="DataCommon\AADUtility.cs" />
<Compile Include="DataCommon\CheckConnStrSetupFactAttribute.cs" />
<Compile Include="EventSource\EventSourceTest.cs" />
<Compile Condition="'$(TargetGroup)'=='netcoreapp'" Include="TracingTests\DiagnosticTest.cs" />
<Compile Include="TracingTests\EventSourceTest.cs" />
<Compile Condition="'$(TargetGroup)'=='netcoreapp'" Include="TracingTests\FakeDiagnosticListenerObserver.cs" />
<Compile Include="SQL\AdapterTest\AdapterTest.cs" />
<Compile Include="SQL\AsyncTest\BeginExecAsyncTest.cs" />
<Compile Include="SQL\AsyncTest\BeginExecReaderAsyncTest.cs" />
Expand Down Expand Up @@ -184,6 +186,7 @@
<Compile Include="SQL\Utf8SupportTest\Utf8SupportTest.cs" />
<Compile Include="SQL\WeakRefTest\WeakRefTest.cs" />
<Compile Include="SQL\WeakRefTestYukonSpecific\WeakRefTestYukonSpecific.cs" />
<Compile Include="TracingTests\TestTdsServer.cs" />
<Compile Include="XUnitAssemblyAttributes.cs" />
<Content Include="DDBasics\DDDataTypesTest\data.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -241,6 +244,9 @@
<ProjectReference Include="$(TestsPath)tools\Microsoft.DotNet.XUnitExtensions\Microsoft.DotNet.XUnitExtensions.csproj">
<Name>Microsoft.DotNet.XUnitExtensions</Name>
</ProjectReference>
<ProjectReference Include="..\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
<ProjectReference Include="..\tools\TDS\TDS.Servers\TDS.Servers.csproj" />
<ProjectReference Include="..\tools\TDS\TDS\TDS.csproj" />
<ProjectReference Include="SQL\UdtTest\UDTs\Address\Address.csproj">
<Name>Address</Name>
</ProjectReference>
Expand All @@ -267,6 +273,7 @@
<PackageReference Include="System.Net.Sockets" Version="$(SystemNetSocketsVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="Microsoft.Windows.Compatibility" Version="$(MicrosoftWindowsCompatibilityVersion)" />
<PackageReference Condition="'$(TargetGroup)' == 'netcoreapp'" Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotnetRemoteExecutorVersion)" />
</ItemGroup>
<ItemGroup>
<None Condition="'$(TargetGroup)'=='netfx'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\**\SNI.dll" CopyToOutputDirectory="PreserveNewest" />
Expand Down
Loading