Don't try and use a repo GitHub token if testing OD exclusively

tgstation · Sep 5, 2024 · 2df11b4 · 2df11b4
1 parent 1c234b1
commit 2df11b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs
@@ -274,7 +274,8 @@ await Task.WhenAll(
 
 			var configSetupTask = new ConfigurationTest(instanceClient.Configuration, instanceClient.Metadata).SetupDMApiTests(true, cancellationToken);
 
-			if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS_TEST_GITHUB_TOKEN")))
+			if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS_TEST_GITHUB_TOKEN"))
+				&& !(Boolean.TryParse(Environment.GetEnvironmentVariable("TGS_TEST_OD_EXCLUSIVE"), out var odExclusive) && odExclusive))
 				await instanceClient.Repository.Update(new RepositoryUpdateRequest
 				{
 					CreateGitHubDeployments = true,

diff --git a/tests/Tgstation.Server.Tests/Live/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/RepositoryTest.cs
@@ -128,7 +128,8 @@ public async Task AbortLongCloneAndCloneSomethingQuick(Task<JobResponse> longClo
 			updated = await Checkout(new RepositoryUpdateRequest { Reference = "master" }, false, true, cancellationToken);
 
 			// enable the good shit if possible
-			if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS_TEST_GITHUB_TOKEN")))
+			if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS_TEST_GITHUB_TOKEN"))
+				&& !(Boolean.TryParse(Environment.GetEnvironmentVariable("TGS_TEST_OD_EXCLUSIVE"), out var odExclusive) && odExclusive))
 				await repositoryClient.Update(new RepositoryUpdateRequest
 				{
 					CreateGitHubDeployments = true,

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -1228,7 +1228,7 @@ await instanceClient.DreamDaemon.Update(new DreamDaemonRequest
 		[TestMethod]
 		public Task TestOpenDreamExclusiveTgsOperation()
 		{
-			if (Environment.GetEnvironmentVariable("TGS_TEST_OD_EXCLUSIVE") != "true")
+			if (!Boolean.TryParse(Environment.GetEnvironmentVariable("TGS_TEST_OD_EXCLUSIVE"), out var odExclusive) || !odExclusive)
 				Assert.Inconclusive("This test is covered by TestStandardTgsOperation");
 
 			return TestStandardTgsOperation(true);