From da9dbd6d65f85461dc4745bb2ce36f11334ef28e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 28 Apr 2020 16:50:08 -0400 Subject: [PATCH] Make some permanent PRs for the repository test --- .../Instance/RepositoryTest.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs index abab934c61..5e7bcda35e 100644 --- a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs @@ -106,12 +106,15 @@ namespace Tgstation.Server.Tests.Instance if (String.IsNullOrWhiteSpace(testPRString)) testPRString = Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST"); - if (!String.IsNullOrWhiteSpace(testPRString)) - { - if (!int.TryParse(testPRString, out var prNumber)) - Assert.Inconclusive($"Invalid PR #: {testPRString}"); - await TestMergeTests(updated, prNumber, cancellationToken); - } + if (String.IsNullOrWhiteSpace(testPRString)) + if (workingBranch == "dev") + testPRString = "957"; + else + testPRString = "958"; + + if (!int.TryParse(testPRString, out var prNumber)) + Assert.Inconclusive($"Invalid PR #: {testPRString}"); + await TestMergeTests(updated, prNumber, cancellationToken); } async Task Checkout(Repository updated, bool expectFailure, bool isRef, CancellationToken cancellationToken)