Merge branch 'unbased' of https://github.com/tgstation/tgstation-server into unbased

This commit is contained in:
AffectedArc07
2020-08-19 18:39:46 +01:00
@@ -60,11 +60,13 @@ namespace Tgstation.Server.Tests
}
catch (RateLimitException)
{
if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS4_TEST_GITHUB_TOKEN")))
throw;
if (String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS4_TEST_GITHUB_TOKEN")))
{
Assert.Inconclusive("GitHub rate limit hit while testing administration endpoint. Set environment variable TGS4_TEST_GITHUB_TOKEN to fix this!");
}
Assert.Inconclusive("GitHub rate limit hit while testing administration endpoint. Set environment variable TGS4_TEST_GITHUB_TOKEN to fix this!");
return; //c# needs the equivalent of [noreturn]
// CI fails all the time b/c of this, ignore it
return;
}
Assert.AreEqual(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), model.WindowsHost);