add instrumentation for #32797

wfurt · Jan 29, 2019 · e462195 · e462195
1 parent a0fdbba
commit e462195
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs b/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs
@@ -35,7 +35,6 @@ public void TryGetAddrInfo_LocalHost()
             Assert.NotNull(hostEntry.Aliases);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotArm64Process))] // [ActiveIssue(32797)]
         public void TryGetAddrInfo_HostName()
         {
             string hostName = NameResolutionPal.GetHostName();
@@ -44,12 +43,21 @@ public void TryGetAddrInfo_HostName()
             IPHostEntry hostEntry;
             int nativeErrorCode;
             SocketError error = NameResolutionPal.TryGetAddrInfo(hostName, out hostEntry, out nativeErrorCode);
-            if (error == SocketError.HostNotFound && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)))
+            if (error == SocketError.HostNotFound && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD)))
             {
                 // On Unix, we are not guaranteed to be able to resove the local host. The ability to do so depends on the 
                 // machine configurations, which varies by distro and is often inconsistent.
                 return;
             }
+
+            // Temporary instrumentation for #32797
+            if (error == SocketError.TryAgain && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD)))
+            {
+                if (error != SocketError.TryAgain)
+                {
+                    throw new InvalidOperationException("Name resolution failure preventable with retry");
+                }
+            }
 
             Assert.Equal(SocketError.Success, error);
             Assert.NotNull(hostEntry);
@@ -92,7 +100,6 @@ public void TryGetAddrInfo_LocalHost_TryGetNameInfo()
             Assert.NotNull(name);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotArm64Process))] // [ActiveIssue(32797)]
         public void TryGetAddrInfo_HostName_TryGetNameInfo()
         {
             string hostName = NameResolutionPal.GetHostName();
@@ -105,10 +112,19 @@ public void TryGetAddrInfo_HostName_TryGetNameInfo()
             {
                 // On Unix, getaddrinfo returns host not found, if all the machine discovery settings on the local network
                 // is turned off. Hence dns lookup for it's own hostname fails.
-                Assert.True(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX));
+                Assert.True(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD));
                 return;
             }
 
+            // Temporary instrumentation for #32797
+            if (error == SocketError.TryAgain && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD)))
+            {
+                if (error != SocketError.TryAgain)
+                {
+                    throw new InvalidOperationException("Name resolution failure preventable with retry");
+                }
+            }
+
             Assert.Equal(SocketError.Success, error);
             Assert.NotNull(hostEntry);