Skip to content

Commit 16ec2a1

Browse files
committed
Not sure why the proxy cannot resolve this. Let's try!
1 parent 2a62f94 commit 16ec2a1

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ProxyServer.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,7 @@ public static ProxyServer CreateAndStartProxy(string connectionString, out strin
318318
DataSourceBuilder dataSourceBuilder = new DataSourceBuilder(connStringbuilder.DataSource);
319319

320320
// Setup proxy
321-
Task<System.Net.IPHostEntry> ipEntryTask = Dns.GetHostEntryAsync(dataSourceBuilder.ServerName);
322-
ipEntryTask.Wait();
323-
System.Net.IPHostEntry serverIpEntry = ipEntryTask.Result;
321+
IPHostEntry serverIpEntry = Dns.GetHostEntry(dataSourceBuilder.ServerName);
324322

325323
ProxyServer proxy = new ProxyServer();
326324
proxy.RemoteEndpoint = new IPEndPoint(serverIpEntry.AddressList[0], dataSourceBuilder.Port ?? 1433);

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,16 @@ private static void RunAllTestsForSingleServer(string connectionString, bool usi
180180
StreamingBlobDataTypes(connectionString);
181181
OutOfOrderGetChars(connectionString);
182182

183-
if (!Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(connectionString).DataSource))
183+
// Azure Database does not support Server scoped XEvents
184+
if (!IsAzureSqlServer(connectionString))
184185
{
185186
TestXEventsStreaming(connectionString);
186187
}
187188

188189
// These tests fail with named pipes, since they try to do DNS lookups on named pipe paths.
189190
if (!usingNamePipes)
190191
{
191-
if (DataTestUtility.IsUsingNativeSNI())
192+
if (!IsAzureSqlServer(connectionString) && DataTestUtility.IsUsingNativeSNI())
192193
{
193194
TimeoutDuringReadAsyncWithClosedReaderTest(connectionString);
194195
}
@@ -197,6 +198,11 @@ private static void RunAllTestsForSingleServer(string connectionString, bool usi
197198
}
198199
}
199200

201+
private static bool IsAzureSqlServer(string connectionString)
202+
{
203+
return Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(connectionString).DataSource;
204+
}
205+
200206
private static void MultipleResults(string connectionString)
201207
{
202208
using (SqlConnection conn = new SqlConnection(connectionString))

0 commit comments

Comments
 (0)