From 6ad80095ff272c0558ddf328157becccc42269bb Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 20 Oct 2024 17:10:34 -0400 Subject: [PATCH] Fix bad test mutation operation invocations --- .../Tgstation.Server.Tests/Live/ApiAssert.cs | 3 +++ .../Live/GraphQLServerClientExtensions.cs | 1 + .../Live/TestLiveServer.cs | 20 +++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Live/ApiAssert.cs b/tests/Tgstation.Server.Tests/Live/ApiAssert.cs index 5bd736c6cc..2792289dd6 100644 --- a/tests/Tgstation.Server.Tests/Live/ApiAssert.cs +++ b/tests/Tgstation.Server.Tests/Live/ApiAssert.cs @@ -11,6 +11,8 @@ using StrawberryShake; using Tgstation.Server.Client; using Tgstation.Server.Client.GraphQL; +using static HotChocolate.ErrorCodes; + namespace Tgstation.Server.Tests.Live { /// @@ -78,6 +80,7 @@ namespace Tgstation.Server.Tests.Live var payload = payloadSelector(operationResult.Data); + Assert.AreNotSame(operationResult.Data, payload, "Select the mutation payload from the operation result!"); var payloadErrors = (IEnumerable)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 index 993b8999ad..db373b61f6 100644 --- a/tests/Tgstation.Server.Tests/Live/GraphQLServerClientExtensions.cs +++ b/tests/Tgstation.Server.Tests/Live/GraphQLServerClientExtensions.cs @@ -33,6 +33,7 @@ namespace Tgstation.Server.Tests.Live var result = await serverClient.RunOperation(operationExecutor, cancellationToken); result.EnsureNoErrors(); var data = payloadSelector(result.Data); + Assert.AreNotSame(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 index 5df923a85c..6c695ec0d6 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -361,7 +361,7 @@ namespace Tgstation.Server.Tests.Live }, async gqlClient => await gqlClient.RunMutationEnsureNoErrors( gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken), - result => result, + result => result.ChangeServerNodeVersionViaTrackedRepository, cancellationToken)); try @@ -549,7 +549,7 @@ namespace Tgstation.Server.Tests.Live }, 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 @@ namespace Tgstation.Server.Tests.Live 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 @@ namespace Tgstation.Server.Tests.Live 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 @@ namespace Tgstation.Server.Tests.Live 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 @@ namespace Tgstation.Server.Tests.Live 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, @@ -1042,7 +1042,7 @@ namespace Tgstation.Server.Tests.Live async gqlClient => await ApiAssert.OperationFails( gqlClient, gql => gql.RepositoryBasedServerUpdate.ExecuteAsync(TestUpdateVersion, cancellationToken), - result => result, + result => result.ChangeServerNodeVersionViaTrackedRepository, Client.GraphQL.ErrorCode.SwarmIntegrityCheckFailed, cancellationToken)); @@ -1685,7 +1685,7 @@ namespace Tgstation.Server.Tests.Live 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 @@ namespace Tgstation.Server.Tests.Live 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 @@ namespace Tgstation.Server.Tests.Live restClient => restClient.Administration.Restart(cancellationToken), async gqlClient => await gqlClient.RunMutationEnsureNoErrors( gql => gql.RestartServer.ExecuteAsync(cancellationToken), - result => result, + result => result.RestartServerNode, cancellationToken)); }