Fix bad test mutation operation invocations

tgstation · Oct 20, 2024 · 6427938 · 6427938
1 parent 6d391a5
commit 6427938
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/tests/Tgstation.Server.Tests/Live/ApiAssert.cs b/tests/Tgstation.Server.Tests/Live/ApiAssert.cs
@@ -11,6 +11,8 @@
 using Tgstation.Server.Client;
 using Tgstation.Server.Client.GraphQL;
 
+using static HotChocolate.ErrorCodes;
+
 namespace Tgstation.Server.Tests.Live
 {
 	/// <summary>
@@ -78,6 +80,7 @@ public static async ValueTask OperationFails<TResultData, TPayload>(
 
 			var payload = payloadSelector(operationResult.Data);
 
+			Assert.AreNotSame<object>(operationResult.Data, payload, "Select the mutation payload from the operation result!");
 			var payloadErrors = (IEnumerable<object>)payload.GetType().GetProperty("Errors").GetValue(payload);
 			var error = payloadErrors.Single();
 

diff --git a/tests/Tgstation.Server.Tests/Live/GraphQLServerClientExtensions.cs b/tests/Tgstation.Server.Tests/Live/GraphQLServerClientExtensions.cs
@@ -33,6 +33,7 @@ public static async ValueTask<TPayload> RunMutationEnsureNoErrors<TResultData, T
 			var result = await serverClient.RunOperation(operationExecutor, cancellationToken);
 			result.EnsureNoErrors();
 			var data = payloadSelector(result.Data);
+			Assert.AreNotSame<object>(result.Data, data, "Select the mutation payload from the operation result!");
 			var errorsObject = data.GetType().GetProperty("Errors").GetValue(data);
 			if (errorsObject != null)
 			{

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -361,7 +361,7 @@ await adminClient.Execute(
 						},
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken),
-							result => result,
+							result => result.ChangeServerNodeVersionViaTrackedRepository,
 							cancellationToken));
 
 					try
@@ -549,7 +549,7 @@ await controllerClient.Execute(
 						},
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken),
-							result => result,
+							result => result.ChangeServerNodeVersionViaTrackedRepository,
 							cancellationToken));
 
 					await Task.WhenAny(Task.Delay(TimeSpan.FromMinutes(2)), serverTask);
@@ -737,7 +737,7 @@ await node1Client.Execute(
 							cancellationToken),
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken),
-							result => result,
+							result => result.ChangeServerNodeVersionViaTrackedRepository,
 							cancellationToken));
 					await Task.WhenAny(Task.Delay(TimeSpan.FromMinutes(2)), serverTask);
 					Assert.IsTrue(serverTask.IsCompleted);
@@ -786,7 +786,7 @@ await controllerClient2.Execute(
 						async gqlClient => await ApiAssert.OperationFails(
 							gqlClient,
 							gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken),
-							result => result,
+							result => result.ChangeServerNodeVersionViaTrackedRepository,
 							Client.GraphQL.ErrorCode.SwarmIntegrityCheckFailed,
 							cancellationToken));
 
@@ -988,7 +988,7 @@ await controllerClient.Execute(
 						restClient => restClient.Administration.Restart(cancellationToken),
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RestartServer.ExecuteAsync(cancellationToken),
-							result => result,
+							result => result.RestartServerNode,
 							cancellationToken));
 
 					await Task.WhenAny(
@@ -1016,7 +1016,7 @@ await node2Client.Execute(
 						restClient => restClient.Administration.Restart(cancellationToken),
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RestartServer.ExecuteAsync(cancellationToken),
-							result => result,
+							result => result.RestartServerNode,
 							cancellationToken));
 					await Task.WhenAny(
 						node2Task,
@@ -1685,7 +1685,7 @@ await firstAdminMultiClient.Execute(
 							restClient => restClient.Administration.Restart(cancellationToken),
 							async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 								gql => gql.RestartServer.ExecuteAsync(cancellationToken),
-								result => result,
+								result => result.RestartServerNode,
 								cancellationToken));
 					}
 					catch
@@ -1835,7 +1835,7 @@ await multiClient.Execute(
 						restClient => restClient.Administration.Restart(cancellationToken),
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RestartServer.ExecuteAsync(cancellationToken),
-							result => result,
+							result => result.RestartServerNode,
 							cancellationToken));
 				}
 
@@ -1907,7 +1907,7 @@ await adminClient.Execute(
 						restClient => restClient.Administration.Restart(cancellationToken),
 						async gqlClient => await gqlClient.RunMutationEnsureNoErrors(
 							gql => gql.RestartServer.ExecuteAsync(cancellationToken),
-							result => result,
+							result => result.RestartServerNode,
 							cancellationToken));
 				}