From 52588509edca5de217b58373119122c657787c25 Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Fri, 16 Mar 2018 22:00:07 +0100
Subject: [PATCH] Fixed failing test and some flaky tests.

---
 .../FixFutureDownloadClientStatusTimesFixture.cs           | 2 +-
 .../Messaging/Commands/CommandExecutorFixture.cs           | 3 +++
 .../ParserTests/ParsingServiceTests/GetEpisodesFixture.cs  | 2 +-
 .../EnvironmentInfo/MonoPlatformInfoFixture.cs             | 7 +++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs
index de3251c76..7ba5dbf22 100644
--- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
             Mocker.GetMock<IDownloadClientStatusRepository>()
                   .Verify(v => v.UpdateMany(
                           It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.DisabledTill.Value < DateTime.UtcNow.AddMinutes(disabledTillTime)))
+                              s => s.DisabledTill.Value <= DateTime.UtcNow.AddMinutes(disabledTillTime)))
                       )
                   );
         }
diff --git a/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs b/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
index b11ffa2d7..0f9435ae6 100644
--- a/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
+++ b/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
@@ -137,6 +137,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             QueueAndWaitForExecution(commandModel);
 
             VerifyEventPublished<CommandExecutedEvent>();
+
+            Thread.Sleep(10);
+
             ExceptionVerification.ExpectedErrors(1);
         }
 
diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/GetEpisodesFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/GetEpisodesFixture.cs
index 5ca2b02e5..8103cb483 100644
--- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/GetEpisodesFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/GetEpisodesFixture.cs
@@ -294,7 +294,7 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
 
             Mocker.GetMock<IEpisodeService>()
                   .Setup(s => s.FindEpisodesBySceneNumbering(It.IsAny<int>(), seasonNumber, It.IsAny<int>()))
-                  .Returns(Builder<Episode>.CreateListOfSize(0).Build().ToList());
+                  .Returns(new List<Episode>());
 
             Subject.GetEpisodes(_parsedEpisodeInfo, _series, true, null);
 
diff --git a/src/NzbDrone.Mono.Test/EnvironmentInfo/MonoPlatformInfoFixture.cs b/src/NzbDrone.Mono.Test/EnvironmentInfo/MonoPlatformInfoFixture.cs
index 3e0c17794..431dab769 100644
--- a/src/NzbDrone.Mono.Test/EnvironmentInfo/MonoPlatformInfoFixture.cs
+++ b/src/NzbDrone.Mono.Test/EnvironmentInfo/MonoPlatformInfoFixture.cs
@@ -13,8 +13,11 @@ namespace NzbDrone.Mono.Test.EnvironmentInfo
         [Test]
         public void should_get_framework_version()
         {
-            Subject.Version.Major.Should().Be(4);
-            Subject.Version.Minor.Should().BeOneOf(0, 5, 6);
+            Subject.Version.Major.Should().BeOneOf(4, 5);
+            if (Subject.Version.Major == 4)
+            {
+                Subject.Version.Minor.Should().BeOneOf(0, 5, 6);
+            }
         }
     }
 }