From 7445adb4551b9735d593a905f36f089b8aea1730 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 14 Mar 2014 13:20:31 -0700 Subject: [PATCH] mono version check will support 3 digit versions --- .../Checks/MonoVersionCheckFixture.cs | 16 ++++++++++++++++ .../HealthCheck/Checks/MonoVersionCheck.cs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs index 8a9ab0e73..5f968a90b 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs @@ -62,5 +62,21 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks Subject.Check().Should().BeNull(); } + + [Test] + public void should_return_null_when_mono_3_2_7() + { + GivenOutput("3.2.7"); + + Subject.Check().Should().BeNull(); + } + + [Test] + public void should_return_null_when_mono_3_2_1() + { + GivenOutput("3.2.1"); + + Subject.Check().Should().BeNull(); + } } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index be2caf75f..ed24bf018 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.HealthCheck.Checks { private readonly IProcessProvider _processProvider; private readonly Logger _logger; - private static readonly Regex VersionRegex = new Regex(@"(?<=\W)(?\d+\.\d+\.\d+\.\d+)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex VersionRegex = new Regex(@"(?<=\W)(?\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); public MonoVersionCheck(IProcessProvider processProvider, Logger logger) {