From 11db27f6ac1a6fbdc97e2a0ac783712c5ee0619d Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sat, 25 Feb 2012 11:57:56 -0800 Subject: [PATCH] Better check against internal server error exceptions during unit tests. --- NzbDrone.Core.Test/IndexerTests.cs | 1 + NzbDrone.Core/Providers/Indexer/IndexerBase.cs | 10 +++++----- NzbDrone.Test.Common/ExceptionVerification.cs | 7 +++---- NzbDrone.Web/Content/Grid.css | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs index ffe9336e7..0d93fb8d5 100644 --- a/NzbDrone.Core.Test/IndexerTests.cs +++ b/NzbDrone.Core.Test/IndexerTests.cs @@ -399,6 +399,7 @@ namespace NzbDrone.Core.Test ExceptionVerification.MarkInconclusive(typeof(WebException)); ExceptionVerification.MarkInconclusive("System.Net.WebException"); ExceptionVerification.MarkInconclusive("(503) Server Unavailable."); + ExceptionVerification.MarkInconclusive("(500) Internal Server Error."); } } } diff --git a/NzbDrone.Core/Providers/Indexer/IndexerBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerBase.cs index f020f85cb..157bb2cc4 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerBase.cs @@ -99,25 +99,25 @@ namespace NzbDrone.Core.Providers.Indexer public virtual IList FetchSeason(string seriesTitle, int seasonNumber) { - _logger.Debug("Searching {0} for {1}-Season {2}", Name, seriesTitle, seasonNumber); + _logger.Debug("Searching {0} for {1} Season {2}", Name, seriesTitle, seasonNumber); var searchUrls = GetSeasonSearchUrls(GetQueryTitle(seriesTitle), seasonNumber); var result = Fetch(searchUrls); - _logger.Info("Finished searching {0} for {1}-S{2}, Found {3}", Name, seriesTitle, seasonNumber, result.Count); + _logger.Info("Finished searching {0} for {1} Season {2}, Found {3}", Name, seriesTitle, seasonNumber, result.Count); return result; } public virtual IList FetchPartialSeason(string seriesTitle, int seasonNumber, int episodePrefix) { - _logger.Debug("Searching {0} for {1}-Season {2}, Prefix: {3}", Name, seriesTitle, seasonNumber, episodePrefix); + _logger.Debug("Searching {0} for {1} Season {2}, Prefix: {3}", Name, seriesTitle, seasonNumber, episodePrefix); var searchUrls = GetPartialSeasonSearchUrls(GetQueryTitle(seriesTitle), seasonNumber, episodePrefix); var result = Fetch(searchUrls); - _logger.Info("Finished searching {0} for {1}-S{2}, Found {3}", Name, seriesTitle, seasonNumber, result.Count); + _logger.Info("Finished searching {0} for {1} Season {2}, Found {3}", Name, seriesTitle, seasonNumber, result.Count); return result; } @@ -129,7 +129,7 @@ namespace NzbDrone.Core.Providers.Indexer var result = Fetch(searchUrls); - _logger.Info("Finished searching {0} for {1}-S{2}E{3:00}, Found {4}", Name, seriesTitle, seasonNumber, episodeNumber, result.Count); + _logger.Info("Finished searching {0} for {1} S{2:00}E{3:00}, Found {4}", Name, seriesTitle, seasonNumber, episodeNumber, result.Count); return result; } diff --git a/NzbDrone.Test.Common/ExceptionVerification.cs b/NzbDrone.Test.Common/ExceptionVerification.cs index c58e2059f..40dfe9057 100644 --- a/NzbDrone.Test.Common/ExceptionVerification.cs +++ b/NzbDrone.Test.Common/ExceptionVerification.cs @@ -78,19 +78,18 @@ namespace NzbDrone.Test.Common { var inconclusiveLogs = _logs.Where(l => l.Exception != null && l.Exception.GetType() == exception).ToList(); - if (inconclusiveLogs.Count != 0) + if (inconclusiveLogs.Any()) { inconclusiveLogs.ForEach(c => _logs.Remove(c)); Assert.Inconclusive(GetLogsString(inconclusiveLogs)); - } } public static void MarkInconclusive(string text) { - var inconclusiveLogs = _logs.Where(l => l.FormattedMessage.Contains(text)).ToList(); + var inconclusiveLogs = _logs.Where(l => l.FormattedMessage.ToLower().Contains(text.ToLower())).ToList(); - if (inconclusiveLogs.Count != 0) + if (inconclusiveLogs.Any()) { inconclusiveLogs.ForEach(c => _logs.Remove(c)); Assert.Inconclusive(GetLogsString(inconclusiveLogs)); diff --git a/NzbDrone.Web/Content/Grid.css b/NzbDrone.Web/Content/Grid.css index 6d5f4c76a..f376a1cff 100644 --- a/NzbDrone.Web/Content/Grid.css +++ b/NzbDrone.Web/Content/Grid.css @@ -71,6 +71,8 @@ background: lightgray; } + + .episodeMissing { background-color: #f5c5c5;