From 7792c159b47f4c125c7714be4b1130f066d41613 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 17 Nov 2020 21:52:22 -0500
Subject: [PATCH] Movie Windows/Posix Disk Tests to correct fixtures

Fixes: #4678
---
 .../DiskTests/FreeSpaceFixtureBase.cs         | 39 +------------------
 .../DiskProviderTests/FreeSpaceFixture.cs     | 18 +++++++++
 src/NzbDrone.Test.Common/LoggingTest.cs       |  2 +-
 .../DiskProviderTests/FreeSpaceFixture.cs     | 29 +++++++++++++-
 4 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs b/src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs
index 63d973946..64860f450 100644
--- a/src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs
+++ b/src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using FluentAssertions;
 using NUnit.Framework;
@@ -28,14 +28,6 @@ namespace NzbDrone.Common.Test.DiskTests
             Subject.GetAvailableSpace(Path.Combine(path, "invalidFolder")).Should().NotBe(0);
         }
 
-        [Ignore("Docker")]
-        [Test]
-        public void should_be_able_to_check_space_on_ramdrive()
-        {
-            PosixOnly();
-            Subject.GetAvailableSpace("/run/").Should().NotBe(0);
-        }
-
         [Ignore("Docker")]
         [Test]
         public void should_return_free_disk_space()
@@ -44,35 +36,6 @@ namespace NzbDrone.Common.Test.DiskTests
             result.Should().BeGreaterThan(0);
         }
 
-        [Test]
-        public void should_be_able_to_get_space_on_unc()
-        {
-            WindowsOnly();
-
-            var result = Subject.GetAvailableSpace(@"\\localhost\c$\Windows");
-            result.Should().BeGreaterThan(0);
-        }
-
-        [Test]
-        public void should_throw_if_drive_doesnt_exist()
-        {
-            WindowsOnly();
-
-            // Find a drive that doesn't exist.
-            for (char driveletter = 'Z'; driveletter > 'D'; driveletter--)
-            {
-                if (new DriveInfo(driveletter.ToString()).IsReady)
-                {
-                    continue;
-                }
-
-                Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvailableSpace(driveletter + @":\NOT_A_REAL_PATH\DOES_NOT_EXIST".AsOsAgnostic()));
-                return;
-            }
-
-            Assert.Inconclusive("No drive available for testing.");
-        }
-
         [Ignore("Docker")]
         [Test]
         public void should_be_able_to_get_space_on_folder_that_doesnt_exist()
diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
index 619194cdd..6ee2dc7df 100644
--- a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
+++ b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
@@ -1,3 +1,5 @@
+using FluentAssertions;
+using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Test.DiskTests;
 using NzbDrone.Mono.Disk;
@@ -12,5 +14,21 @@ namespace NzbDrone.Mono.Test.DiskProviderTests
         {
             PosixOnly();
         }
+
+        [SetUp]
+        public void Setup()
+        {
+            Mocker.SetConstant<IProcMountProvider>(new ProcMountProvider(TestLogger));
+            Mocker.GetMock<ISymbolicLinkResolver>()
+                  .Setup(v => v.GetCompleteRealPath(It.IsAny<string>()))
+                  .Returns<string>(s => s);
+        }
+
+        [Ignore("Docker")]
+        [Test]
+        public void should_be_able_to_check_space_on_ramdrive()
+        {
+            Subject.GetAvailableSpace("/run/").Should().NotBe(0);
+        }
     }
 }
diff --git a/src/NzbDrone.Test.Common/LoggingTest.cs b/src/NzbDrone.Test.Common/LoggingTest.cs
index f08d3aa4b..4f837f9f9 100644
--- a/src/NzbDrone.Test.Common/LoggingTest.cs
+++ b/src/NzbDrone.Test.Common/LoggingTest.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Test.Common
 
         private static void RegisterConsoleLogger()
         {
-            var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" };
+            var consoleTarget = new ConsoleTarget { Layout = "${date:format=HH\\:mm\\:ss.f} ${level}: ${message} ${exception}" };
             LogManager.Configuration.AddTarget(consoleTarget.GetType().Name, consoleTarget);
             LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget));
         }
diff --git a/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs b/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs
index c68de2451..644100a0c 100644
--- a/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs
+++ b/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs
@@ -1,4 +1,6 @@
-using NUnit.Framework;
+using System.IO;
+using FluentAssertions;
+using NUnit.Framework;
 using NzbDrone.Common.Test.DiskTests;
 using NzbDrone.Windows.Disk;
 
@@ -12,5 +14,30 @@ namespace NzbDrone.Windows.Test.DiskProviderTests
         {
             WindowsOnly();
         }
+
+        [Test]
+        public void should_throw_if_drive_doesnt_exist()
+        {
+            // Find a drive that doesn't exist.
+            for (char driveletter = 'Z'; driveletter > 'D'; driveletter--)
+            {
+                if (new DriveInfo(driveletter.ToString()).IsReady)
+                {
+                    continue;
+                }
+
+                Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvailableSpace(driveletter + @":\NOT_A_REAL_PATH\DOES_NOT_EXIST"));
+                return;
+            }
+
+            Assert.Inconclusive("No drive available for testing.");
+        }
+
+        [Test]
+        public void should_be_able_to_get_space_on_unc()
+        {
+            var result = Subject.GetAvailableSpace(@"\\localhost\c$\Windows");
+            result.Should().BeGreaterThan(0);
+        }
     }
 }