From cb173d79e6f0c192be88eb6466d9cd52a9ee0e46 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 10 Sep 2020 14:30:33 +0200
Subject: [PATCH] Fix the test

---
 Jellyfin.Api/Helpers/RequestHelpers.cs                  | 5 -----
 MediaBrowser.Common/Extensions/HttpContextExtensions.cs | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index d15b5603e6..8dcf08af56 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -173,10 +173,5 @@ namespace Jellyfin.Api.Helpers
                 .Select(i => i!.Value)
                 .ToArray();
         }
-
-        internal static IPAddress NormalizeIp(IPAddress ip)
-        {
-            return ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4() : ip;
-        }
     }
 }
diff --git a/MediaBrowser.Common/Extensions/HttpContextExtensions.cs b/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
index 8d29088825..19fa95480d 100644
--- a/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
+++ b/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
@@ -1,3 +1,4 @@
+using System.Net;
 using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Common.Extensions
@@ -26,7 +27,8 @@ namespace MediaBrowser.Common.Extensions
         /// <returns>The remote caller IP address.</returns>
         public static string GetNormalizedRemoteIp(this HttpContext context)
         {
-            var ip = context.Connection.RemoteIpAddress;
+            // Default to the loopback address if no RemoteIpAddress is specified (i.e. during integration tests)
+            var ip = context.Connection.RemoteIpAddress ?? IPAddress.Loopback;
 
             if (ip.IsIPv4MappedToIPv6)
             {