From 0687892b9de0ecbe6f2f52e6d3911caec24d2768 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 16 Jun 2020 12:56:37 -0400 Subject: [PATCH] Remove the spuriously failing repository test --- .../Instance/RepositoryTest.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs index 1cd109c3e7..0d0f384dc4 100644 --- a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs @@ -80,26 +80,26 @@ namespace Tgstation.Server.Tests.Instance // checkout V3 and back cloned.Reference = "V3"; - var updated = await Checkout(cloned, false, true, true, cancellationToken); + var updated = await Checkout(cloned, false, true, cancellationToken); // Specific SHA updated.CheckoutSha = "f43f5bd"; - await ApiAssert.ThrowsException(() => Checkout(updated, false, false, false, cancellationToken), ErrorCode.RepoMismatchShaAndReference); + await ApiAssert.ThrowsException(() => Checkout(updated, false, false, cancellationToken), ErrorCode.RepoMismatchShaAndReference); updated.Reference = null; - updated = await Checkout(updated, false, false, false, cancellationToken); + updated = await Checkout(updated, false, false, cancellationToken); // Fake SHA updated.Reference = null; updated.CheckoutSha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; - updated = await Checkout(updated, true, false, false, cancellationToken); + updated = await Checkout(updated, true, false, cancellationToken); // Fake ref updated.Reference = "Tgs4IntegrationTestFakeBranchNeverNameABranchThis"; - updated = await Checkout(updated, true, true, false, cancellationToken); + updated = await Checkout(updated, true, true, cancellationToken); // Back updated.Reference = workingBranch; - updated = await Checkout(updated, false, true, false, cancellationToken); + updated = await Checkout(updated, false, true, cancellationToken); var testPRString = Environment.GetEnvironmentVariable("TGS4_TEST_PULL_REQUEST_NUMBER"); if (String.IsNullOrWhiteSpace(testPRString)) @@ -118,13 +118,11 @@ namespace Tgstation.Server.Tests.Instance await TestMergeTests(updated, prNumber, cancellationToken); } - async Task Checkout(Repository updated, bool expectFailure, bool isRef, bool checkBusy, CancellationToken cancellationToken) + async Task Checkout(Repository updated, bool expectFailure, bool isRef, CancellationToken cancellationToken) { var newRef = isRef ? updated.Reference : updated.CheckoutSha; var checkingOut = await repositoryClient.Update(updated, cancellationToken); Assert.IsNotNull(checkingOut.ActiveJob); - if(checkBusy) - await ApiAssert.ThrowsException(() => repositoryClient.Read(cancellationToken), ErrorCode.RepoBusy); await WaitForJob(checkingOut.ActiveJob, 30, expectFailure, cancellationToken); var result = await repositoryClient.Read(cancellationToken);