From f6e4ccda843c0eac9dba0d26cd0a6ba3913437d4 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 11 Oct 2014 22:05:21 -0700 Subject: [PATCH] Fixed broken tests (due to logging) --- .../CompletedDownloadServiceFixture.cs | 2 ++ .../Download/FailedDownloadServiceFixture.cs | 20 +++---------------- .../Download/FailedDownloadService.cs | 4 ++-- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs index cd680f7a0..6b6c73dcb 100644 --- a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs @@ -171,6 +171,7 @@ namespace NzbDrone.Core.Test.Download Subject.Execute(new CheckForFinishedDownloadCommand()); VerifyNoImports(); + ExceptionVerification.ExpectedWarns(1); } [Test] @@ -194,6 +195,7 @@ namespace NzbDrone.Core.Test.Download Subject.Execute(new CheckForFinishedDownloadCommand()); VerifyNoImports(); + ExceptionVerification.ExpectedWarns(1); } [Test] diff --git a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs index 901c91195..f95b47bf4 100644 --- a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs @@ -29,6 +29,7 @@ namespace NzbDrone.Core.Test.Download _completed = Builder.CreateListOfSize(5) .All() .With(h => h.Status = DownloadItemStatus.Completed) + .With(h => h.IsEncrypted = false) .With(h => h.Title = "Drone.S01E01.HDTV") .Build() .ToList(); @@ -187,6 +188,7 @@ namespace NzbDrone.Core.Test.Download Subject.Execute(new CheckForFinishedDownloadCommand()); VerifyNoFailedDownloads(); + ExceptionVerification.ExpectedWarns(1); } [Test] @@ -207,6 +209,7 @@ namespace NzbDrone.Core.Test.Download Subject.Execute(new CheckForFinishedDownloadCommand()); VerifyNoFailedDownloads(); + ExceptionVerification.ExpectedWarns(1); } [Test] @@ -312,23 +315,6 @@ namespace NzbDrone.Core.Test.Download VerifyNoFailedDownloads(); } - [Test] - public void should_not_process_if_failed_due_to_lack_of_disk_space() - { - var history = Builder.CreateListOfSize(1) - .Build() - .ToList(); - - GivenGrabbedHistory(history); - GivenFailedDownloadClientHistory(); - - _failed.First().Message = "Unpacking failed, write error or disk is full?"; - - Subject.Execute(new CheckForFinishedDownloadCommand()); - - VerifyNoFailedDownloads(); - } - [Test] public void should_process_if_ageHours_is_not_set() { diff --git a/src/NzbDrone.Core/Download/FailedDownloadService.cs b/src/NzbDrone.Core/Download/FailedDownloadService.cs index 4ce2914dd..cf1f26081 100644 --- a/src/NzbDrone.Core/Download/FailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/FailedDownloadService.cs @@ -66,7 +66,7 @@ namespace NzbDrone.Core.Download if (!grabbedItems.Any()) { - UpdateStatusMessage(trackedDownload, LogLevel.Warn, "Download was not grabbed by drone, ignoring download"); + UpdateStatusMessage(trackedDownload, LogLevel.Warn, "Download wasn't grabbed by drone, ignoring download"); return; } @@ -90,7 +90,7 @@ namespace NzbDrone.Core.Download if (!grabbedItems.Any()) { - UpdateStatusMessage(trackedDownload, LogLevel.Warn, "Download wasn't grabbed by drone or not in a category, ignoring download."); + UpdateStatusMessage(trackedDownload, LogLevel.Warn, "Download wasn't grabbed by drone, ignoring download"); return; }