diff options
Diffstat (limited to 'internal/service/operations/merge_test.go')
| -rw-r--r-- | internal/service/operations/merge_test.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/internal/service/operations/merge_test.go b/internal/service/operations/merge_test.go index 2074a5abf..df1ecff38 100644 --- a/internal/service/operations/merge_test.go +++ b/internal/service/operations/merge_test.go @@ -35,8 +35,8 @@ func TestSuccessfulMerge(t *testing.T) { testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -111,8 +111,8 @@ func TestAbortedMerge(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -182,8 +182,8 @@ func TestFailedMergeConcurrentUpdate(t *testing.T) { testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -226,8 +226,8 @@ func TestFailedMergeDueToHooks(t *testing.T) { testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -288,8 +288,8 @@ func TestSuccessfulUserFFBranchRequest(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -327,8 +327,8 @@ func TestSuccessfulUserFFBranchRequest(t *testing.T) { } func TestFailedUserFFBranchRequest(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -422,8 +422,8 @@ func TestFailedUserFFBranchRequest(t *testing.T) { } func TestFailedUserFFBranchDueToHooks(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -465,8 +465,8 @@ func TestFailedUserFFBranchDueToHooks(t *testing.T) { } func TestSuccessfulUserMergeToRefRequest(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -574,8 +574,8 @@ func TestSuccessfulUserMergeToRefRequest(t *testing.T) { } func TestFailedUserMergeToRefRequest(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() @@ -676,8 +676,8 @@ func TestFailedUserMergeToRefRequest(t *testing.T) { } func TestUserMergeToRefIgnoreHooksRequest(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) - defer server.Stop() + stop, serverSocketPath := runOperationServiceServer(t) + defer stop() client, conn := newOperationClient(t, serverSocketPath) defer conn.Close() |