From a4dacf2812f3299af5e029ca5f5506ef2f896a61 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 24 Dec 2017 01:22:48 -0500
Subject: [PATCH] Fixed: Language Upgrade Tests

---
 .../Processes/ProcessProvider.cs              | 20 ++++++++++++++++++-
 .../QualityUpgradeSpecificationFixture.cs     |  6 +++---
 .../TorrentRssSettingsDetectorFixture.cs      |  1 -
 .../ParserTests/ArtistTitleInfoFixture.cs     |  2 ++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs
index dcc86bebec..f15f591f56 100644
--- a/src/NzbDrone.Common/Processes/ProcessProvider.cs
+++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs
@@ -129,7 +129,25 @@ public Process Start(string path, string args = null, StringDictionary environme
             {
                 foreach (DictionaryEntry environmentVariable in environmentVariables)
                 {
-                    startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
+                    try
+                    {
+                        _logger.Trace("Setting environment variable '{0}' to '{1}'", environmentVariable.Key, environmentVariable.Value);
+                        startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
+                    }
+                    catch (Exception e)
+                    {
+                        if (environmentVariable.Value == null)
+                        {
+                            _logger.Error(e, "Unable to set environment variable '{0}', value is null", environmentVariable.Key);
+                        }
+
+                        else
+                        {
+                            _logger.Error(e, "Unable to set environment variable '{0}'", environmentVariable.Key);
+                        }
+
+                        throw;
+                    }
                 }
             }
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
index 5f44a4b460..07061743fc 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
@@ -31,8 +31,8 @@ public class QualityUpgradeSpecificationFixture : CoreTest<UpgradableSpecificati
             new object[] { Quality.MP3_192, 1, Language.English, Quality.MP3_192, 1, Language.Spanish, Quality.MP3_192, Language.Spanish, true },
             new object[] { Quality.MP3_320, 1, Language.French, Quality.MP3_320, 2, Language.English, Quality.MP3_320, Language.Spanish, true },
             new object[] { Quality.MP3_192, 1, Language.English, Quality.MP3_192, 1, Language.English, Quality.MP3_192, Language.English, false },
-            new object[] { Quality.MP3_320, 1, Language.English, Quality.MP3_320, 2, Language.Spanish, Quality.FLAC, Language.Spanish, false },
-            new object[] { Quality.MP3_320, 1, Language.Spanish, Quality.MP3_320, 2, Language.French, Quality.MP3_320, Language.Spanish, false }
+            new object[] { Quality.MP3_320, 1, Language.English, Quality.MP3_256, 2, Language.Spanish, Quality.FLAC, Language.Spanish, false },
+            new object[] { Quality.MP3_320, 1, Language.Spanish, Quality.MP3_256, 2, Language.French, Quality.MP3_320, Language.Spanish, false }
         };
 
         [SetUp]
@@ -70,7 +70,7 @@ public void IsUpgradeTest(Quality current, int currentVersion, Quality newQualit
                                 .Should().Be(expected);
         }
 
-        [Test, TestCaseSource("IsUpgradeTestCasesLanguages")]
+        [Test, TestCaseSource(nameof(IsUpgradeTestCasesLanguages))]
         public void IsUpgradeTestLanguage(Quality current, int currentVersion, Language currentLanguage, Quality newQuality, int newVersion, Language newLanguage, Quality cutoff, Language languageCutoff, bool expected)
         {
             GivenAutoDownloadPropers(true);
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
index e8222f7d59..409da6bd05 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
@@ -254,7 +254,6 @@ public void should_detect_rss_settings_for_AnimeTosho_without_size()
         }
 
         [TestCase("IPTorrents/IPTorrents.xml")]
-        [TestCase("Newznab/newznab_nzb_su.xml")]
         [TestCase("Nyaa/Nyaa.xml")]
         [TestCase("Torznab/torznab_hdaccess_net.xml")]
         [TestCase("Torznab/torznab_tpb.xml")]
diff --git a/src/NzbDrone.Core.Test/ParserTests/ArtistTitleInfoFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ArtistTitleInfoFixture.cs
index 3d38c3eedb..491626f1b5 100644
--- a/src/NzbDrone.Core.Test/ParserTests/ArtistTitleInfoFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ArtistTitleInfoFixture.cs
@@ -38,6 +38,7 @@ public void should_have_year_when_title_has_a_year()
         }
 
         [Test]
+        [Ignore("Artist Don't have year association thus we dont use this currently")]
         public void should_have_year_in_title_when_title_has_a_year()
         {
             const string title = "House.2004.S01E01.pilot.720p.hdtv";
@@ -48,6 +49,7 @@ public void should_have_year_in_title_when_title_has_a_year()
         }
 
         [Test]
+        [Ignore("Artist Don't have year association thus we dont use this currently")]
         public void should_title_without_year_should_not_contain_year()
         {
             const string title = "House.2004.S01E01.pilot.720p.hdtv";