From 7b159c1e63cd3ed26a53b7c4ce89d66fbd6edd5d Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Fri, 8 Mar 2019 19:37:59 +0100 Subject: [PATCH] Removed Nyaa Integration tests and increased logging detail during integration tests. --- src/NzbDrone.Api/Config/HostConfigResource.cs | 2 ++ .../IndexerIntegrationTests.cs | 34 ------------------- .../IntegrationTest.cs | 5 +++ .../Config/HostConfigResource.cs | 2 ++ 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/src/NzbDrone.Api/Config/HostConfigResource.cs b/src/NzbDrone.Api/Config/HostConfigResource.cs index 4befaf489..74e7e0d62 100644 --- a/src/NzbDrone.Api/Config/HostConfigResource.cs +++ b/src/NzbDrone.Api/Config/HostConfigResource.cs @@ -18,6 +18,7 @@ namespace NzbDrone.Api.Config public string Username { get; set; } public string Password { get; set; } public string LogLevel { get; set; } + public string ConsoleLogLevel { get; set; } public string Branch { get; set; } public string ApiKey { get; set; } public string SslCertHash { get; set; } @@ -55,6 +56,7 @@ namespace NzbDrone.Api.Config //Username //Password LogLevel = model.LogLevel, + ConsoleLogLevel = model.ConsoleLogLevel, Branch = model.Branch, ApiKey = model.ApiKey, SslCertHash = model.SslCertHash, diff --git a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs index a72bb8f57..392403dae 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs @@ -38,40 +38,6 @@ namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests }; } - [Test] - public void nyaa_fetch_recent() - { - var indexer = Mocker.Resolve(); - - indexer.Definition = new IndexerDefinition - { - Name = "MyIndexer", - Settings = new NyaaSettings() - }; - - var result = indexer.FetchRecent(); - - ValidateTorrentResult(result, hasSize: true); - } - - [Test] - public void nyaa_search_single() - { - var indexer = Mocker.Resolve(); - - indexer.Definition = new IndexerDefinition - { - Name = "MyIndexer", - Settings = new NyaaSettings() - }; - - var result = indexer.Fetch(_animeSearchCriteria); - - ValidateTorrentResult(result, hasSize: true); - } - - - private void ValidateTorrentResult(IList reports, bool hasSize = false, bool hasInfoUrl = false, bool hasMagnet = false) { reports.Should().OnlyContain(c => c.GetType() == typeof(TorrentInfo)); diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs index f9bf92a33..876d2eacf 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTest.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs @@ -35,6 +35,11 @@ namespace NzbDrone.Integration.Test Protocol = Core.Indexers.DownloadProtocol.Usenet, Fields = SchemaBuilder.ToSchema(new NewznabSettings()) }); + + // Change Console Log Level to Debug so we get more details. + var config = HostConfig.Get(1); + config.ConsoleLogLevel = "Debug"; + HostConfig.Put(config); } protected override void StopTestTarget() diff --git a/src/Sonarr.Api.V3/Config/HostConfigResource.cs b/src/Sonarr.Api.V3/Config/HostConfigResource.cs index 56262ec90..4baa5aba1 100644 --- a/src/Sonarr.Api.V3/Config/HostConfigResource.cs +++ b/src/Sonarr.Api.V3/Config/HostConfigResource.cs @@ -18,6 +18,7 @@ namespace Sonarr.Api.V3.Config public string Username { get; set; } public string Password { get; set; } public string LogLevel { get; set; } + public string ConsoleLogLevel { get; set; } public string Branch { get; set; } public string ApiKey { get; set; } public string SslCertHash { get; set; } @@ -55,6 +56,7 @@ namespace Sonarr.Api.V3.Config //Username //Password LogLevel = model.LogLevel, + ConsoleLogLevel = model.ConsoleLogLevel, Branch = model.Branch, ApiKey = model.ApiKey, SslCertHash = model.SslCertHash,