Commit 865ac03 1 parent 5cebfbe commit 865ac03 Copy full SHA for 865ac03
File tree 2 files changed +9
-5
lines changed
src/Microsoft.Data.SqlClient
tests/ManualTests/SQL/SqlDSEnumeratorTest
2 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ internal static DataTable GetDataSources()
46
46
finally
47
47
{
48
48
handle = SNINativeMethodWrapper . SNIServerEnumOpen ( ) ;
49
- SqlClientEventSource . Log . TryTraceEvent ( "<sc.{0}.{1}|INFO> {3 } returned handle = {4 }." ,
49
+ SqlClientEventSource . Log . TryTraceEvent ( "<sc.{0}.{1}|INFO> {2 } returned handle = {3 }." ,
50
50
nameof ( SqlDataSourceEnumeratorNativeHelper ) ,
51
51
nameof ( GetDataSources ) ,
52
52
nameof ( SNINativeMethodWrapper . SNIServerEnumOpen ) , handle ) ;
@@ -80,7 +80,7 @@ internal static DataTable GetDataSources()
80
80
if ( handle != ADP . s_ptrZero )
81
81
{
82
82
SNINativeMethodWrapper . SNIServerEnumClose ( handle ) ;
83
- SqlClientEventSource . Log . TryTraceEvent ( "<sc.{0}.{1}|INFO> {3 } called." ,
83
+ SqlClientEventSource . Log . TryTraceEvent ( "<sc.{0}.{1}|INFO> {2 } called." ,
84
84
nameof ( SqlDataSourceEnumeratorNativeHelper ) ,
85
85
nameof ( GetDataSources ) ,
86
86
nameof ( SNINativeMethodWrapper . SNIServerEnumClose ) ) ;
Original file line number Diff line number Diff line change 3
3
// See the LICENSE file in the project root for more information.
4
4
5
5
using System ;
6
+ using System . Linq ;
6
7
using System . ServiceProcess ;
7
8
using Microsoft . Data . Sql ;
8
9
using Xunit ;
@@ -36,9 +37,12 @@ private SqlDataSourceEnumerator GetDSEnumerator()
36
37
{
37
38
// SQL Server Browser runs as a Windows service.
38
39
// TODO: This assessment can be done on CI.
39
- ServiceController sc = new ( "SQLBrowser" ) ;
40
- Assert . Equal ( ServiceControllerStatus . Running , sc . Status ) ;
41
-
40
+ ServiceController [ ] services = ServiceController . GetServices ( Environment . MachineName ) ;
41
+ ServiceController service = services . FirstOrDefault ( s => s . ServiceName == "SQLBrowser" ) ;
42
+ if ( service != null )
43
+ {
44
+ Assert . Equal ( ServiceControllerStatus . Running , service . Status ) ;
45
+ }
42
46
return SqlDataSourceEnumerator . Instance ;
43
47
}
44
48
}
You can’t perform that action at this time.
0 commit comments