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

Code cleanups

Browse Source
This commit is contained in:
Dominion
2023-04-21 15:18:47 -04:00
parent 1c219ebadd
commit e30799d0f2
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Host.Tests/Swarm/TestSwarmProtocol.cs
+6 -8
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
@@ -30,7 +28,7 @@ namespace Tgstation.Server.Host.Tests.Swarm
public async Task TestInitHappensInstantlyWhenControllerIsInitialized()
{
using var controller = new TestableSwarmNode(loggerFactory, GenConfig());
using var node = new TestableSwarmNode(loggerFactory, GenConfig(controller.Config));
using var node = new TestableSwarmNode(loggerFactory, GenConfig(controller));
TestableSwarmNode.Link(controller, node);
@@ -47,8 +45,8 @@ namespace Tgstation.Server.Host.Tests.Swarm
public async Task TestNodeInitializeDoesNotWorkWithoutController()
{
using var controller = new TestableSwarmNode(loggerFactory, GenConfig());
using var node1 = new TestableSwarmNode(loggerFactory, GenConfig(controller.Config));
using var node2 = new TestableSwarmNode(loggerFactory, GenConfig(controller.Config));
using var node1 = new TestableSwarmNode(loggerFactory, GenConfig(controller));
using var node2 = new TestableSwarmNode(loggerFactory, GenConfig(controller));
TestableSwarmNode.Link(controller, node1, node2);
@@ -59,7 +57,7 @@ namespace Tgstation.Server.Host.Tests.Swarm
Assert.AreEqual(SwarmRegistrationResult.Success, await node2.TryInit());
}
SwarmConfiguration GenConfig(SwarmConfiguration controllerConfig = null)
SwarmConfiguration GenConfig(TestableSwarmNode controller = null)
{
ushort randPort;
do
@@ -71,8 +69,8 @@ namespace Tgstation.Server.Host.Tests.Swarm
return new SwarmConfiguration
{
Address = new Uri($"http://127.0.0.1:{randPort}"),
ControllerAddress = controllerConfig?.Address,
Identifier = $"{(controllerConfig == null ? "Controller" : "Node")}{usedPorts.Count}",
ControllerAddress = controller?.Config.Address,
Identifier = $"{(controller == null ? "Controller" : "Node")}{usedPorts.Count}",
PrivateKey = "asdf",
UpdateRequiredNodeCount = (uint)usedPorts.Count - 1,
};
tests/Tgstation.Server.Host.Tests/Swarm/TestableSwarmNode.cs
-5
View File
@@ -1,13 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Elasticsearch.Net;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.VisualStudio.TestTools.UnitTesting;