mirror of https://github.com/Radarr/Radarr
Aphrodite merged health check
This commit is contained in:
parent
dbaccc5f91
commit
72062704ff
|
@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("develop")]
|
[TestCase("develop")]
|
||||||
[TestCase("nightly")]
|
[TestCase("v0.2")]
|
||||||
public void should_return_error_when_branch_is_v1(string branch)
|
public void should_return_error_when_branch_is_v1(string branch)
|
||||||
{
|
{
|
||||||
GivenValidBranch(branch);
|
GivenValidBranch(branch);
|
||||||
|
@ -42,8 +42,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
|
||||||
Subject.Check().ShouldBeError();
|
Subject.Check().ShouldBeError();
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("aphrodite")]
|
[TestCase("nightly")]
|
||||||
[TestCase("Aphrodite")]
|
[TestCase("Nightly")]
|
||||||
public void should_return_no_warning_when_branch_valid(string branch)
|
public void should_return_no_warning_when_branch_valid(string branch)
|
||||||
{
|
{
|
||||||
GivenValidBranch(branch);
|
GivenValidBranch(branch);
|
||||||
|
|
|
@ -23,11 +23,16 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
||||||
|
|
||||||
if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch))
|
if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch))
|
||||||
{
|
{
|
||||||
if (currentBranch == "develop" || currentBranch == "nightly")
|
if (currentBranch == "develop" || currentBranch == "v0.2")
|
||||||
{
|
{
|
||||||
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version");
|
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currentBranch == "aphrodite")
|
||||||
|
{
|
||||||
|
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Branch 'aphrodite' has been merged, switch to 'nightly' for further V3 development", _configFileService.Branch), "#branch-is-for-a-previous-version");
|
||||||
|
}
|
||||||
|
|
||||||
return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckOfficialBranchMessage"), _configFileService.Branch), "#branch-is-not-a-valid-release-branch");
|
return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckOfficialBranchMessage"), _configFileService.Branch), "#branch-is-not-a-valid-release-branch");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +41,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
||||||
|
|
||||||
public enum ReleaseBranches
|
public enum ReleaseBranches
|
||||||
{
|
{
|
||||||
Aphrodite
|
Nightly
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -564,7 +564,7 @@
|
||||||
"RejectionCount": "Rejection Count",
|
"RejectionCount": "Rejection Count",
|
||||||
"RelativePath": "Relative Path",
|
"RelativePath": "Relative Path",
|
||||||
"ReleaseBranchCheckOfficialBranchMessage": "Branch {0} is not a valid Radarr release branch, you will not receive updates",
|
"ReleaseBranchCheckOfficialBranchMessage": "Branch {0} is not a valid Radarr release branch, you will not receive updates",
|
||||||
"ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Aphrodite' for further updates",
|
"ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Nightly' for further updates",
|
||||||
"ReleaseDates": "Release Dates",
|
"ReleaseDates": "Release Dates",
|
||||||
"ReleaseGroup": "Release Group",
|
"ReleaseGroup": "Release Group",
|
||||||
"ReleaseRejected": "Release Rejected",
|
"ReleaseRejected": "Release Rejected",
|
||||||
|
|
Loading…
Reference in New Issue