cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated API fields

Browse Source 
Closes #1718
This commit is contained in:
Jordan Dominion
2023-11-17 11:02:11 -05:00
parent 3a158251a1
commit a4bf9e409b
14 changed files with 12 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs
-14
View File
@@ -122,9 +122,6 @@ namespace Tgstation.Server.Tests.Live.Instance
IsSystemChannel = true,
Tag = "butt2",
ChannelData = channelId,
#pragma warning disable CS0618
IrcChannel = "should_not_be_this!!!JHF*WW(#*(*$&(#*@))("
#pragma warning restore CS0618
}
}
}, cancellationToken);
@@ -137,10 +134,6 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.AreEqual(true, updatedBot.Channels.First().IsUpdatesChannel);
Assert.AreEqual(true, updatedBot.Channels.First().IsWatchdogChannel);
Assert.AreEqual("butt2", updatedBot.Channels.First().Tag);
#pragma warning disable CS0618
Assert.AreEqual(channelId, updatedBot.Channels.First().IrcChannel);
Assert.IsNull(updatedBot.Channels.First().DiscordChannelId);
#pragma warning restore CS0618
Assert.AreEqual(channelId, updatedBot.Channels.First().ChannelData);
}
@@ -224,9 +217,6 @@ namespace Tgstation.Server.Tests.Live.Instance
IsSystemChannel = true,
Tag = "butt",
ChannelData = channelId.ToString(),
#pragma warning disable CS0618
DiscordChannelId = 1234,
#pragma warning restore CS0618
}
}
}, cancellationToken);
@@ -239,10 +229,6 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.AreEqual(true, updatedBot.Channels.First().IsUpdatesChannel);
Assert.AreEqual(true, updatedBot.Channels.First().IsWatchdogChannel);
Assert.AreEqual("butt", updatedBot.Channels.First().Tag);
#pragma warning disable CS0618
Assert.AreEqual(channelId, updatedBot.Channels.First().DiscordChannelId);
Assert.IsNull(updatedBot.Channels.First().IrcChannel);
#pragma warning restore CS0618
Assert.AreEqual(channelId.ToString(), updatedBot.Channels.First().ChannelData);
}
tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
+3 -11
View File
@@ -617,24 +617,20 @@ namespace Tgstation.Server.Tests.Live.Instance
async Task RunHealthCheckTest(bool checkDump, CancellationToken cancellationToken)
{
System.Console.WriteLine("TEST: WATCHDOG HEALTH CHECK TEST");
#pragma warning disable CS0618 // Type or member is obsolete
// Check reverse mapping
var status = await instanceClient.DreamDaemon.Update(new DreamDaemonRequest
{
DumpOnHealthCheckRestart = !checkDump,
}, cancellationToken);
Assert.AreEqual(!checkDump, status.DumpOnHeartbeatRestart);
// enable health checks
status = await instanceClient.DreamDaemon.Update(new DreamDaemonRequest
{
HealthCheckSeconds = 1,
DumpOnHeartbeatRestart = checkDump,
DumpOnHealthCheckRestart = checkDump,
}, cancellationToken);
Assert.AreEqual(checkDump, status.DumpOnHeartbeatRestart);
#pragma warning restore CS0618 // Type or member is obsolete
Assert.AreEqual(checkDump, status.DumpOnHealthCheckRestart);
var startJob = await StartDD(cancellationToken);
@@ -692,8 +688,6 @@ namespace Tgstation.Server.Tests.Live.Instance
await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
ddStatus = await instanceClient.DreamDaemon.Read(cancellationToken);
Assert.AreEqual(1U, ddStatus.HealthCheckSeconds.Value);
#pragma warning disable CS0618 // Type or member is obsolete
Assert.AreEqual(1U, ddStatus.HeartbeatSeconds.Value);
if (ddStatus.Status.Value == WatchdogStatus.Offline)
{
await CheckDMApiFail(ddStatus.ActiveCompileJob, cancellationToken);
@@ -708,11 +702,9 @@ namespace Tgstation.Server.Tests.Live.Instance
// disable health checks
ddStatus = await instanceClient.DreamDaemon.Update(new DreamDaemonRequest
{
HeartbeatSeconds = 0,
HealthCheckSeconds = 0,
}, cancellationToken);
Assert.AreEqual(0U, ddStatus.HealthCheckSeconds.Value);
Assert.AreEqual(0U, ddStatus.HeartbeatSeconds.Value);
#pragma warning restore CS0618 // Type or member is obsolete
if (checkDump)
{
tests/Tgstation.Server.Tests/Live/RawRequestTests.cs
-3
View File
@@ -210,13 +210,10 @@ namespace Tgstation.Server.Tests.Live
Assert.AreEqual(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), serverInfo.WindowsHost);
//check that modifying the token even slightly fucks up the auth
#pragma warning disable CS0618 // Type or member is obsolete
var newToken = new TokenResponse
{
ExpiresAt = serverClient.Token.ExpiresAt,
Bearer = serverClient.Token.Bearer + '0'
};
#pragma warning restore CS0618 // Type or member is obsolete
var badClient = clientFactory.CreateFromToken(serverClient.Url, newToken);
await ApiAssert.ThrowsException<UnauthorizedException, AdministrationResponse>(() => badClient.Administration.Read(cancellationToken));