diff options
Diffstat (limited to 'internal/service/conflicts/list_conflict_files_test.go')
| -rw-r--r-- | internal/service/conflicts/list_conflict_files_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/service/conflicts/list_conflict_files_test.go b/internal/service/conflicts/list_conflict_files_test.go index 074234caa..37d193696 100644 --- a/internal/service/conflicts/list_conflict_files_test.go +++ b/internal/service/conflicts/list_conflict_files_test.go @@ -17,8 +17,8 @@ type conflictFile struct { } func TestSuccessfulListConflictFilesRequest(t *testing.T) { - server, serverSocketPath := runConflictsServer(t) - defer server.Stop() + stop, serverSocketPath := runConflictsServer(t) + defer stop() client, conn := NewConflictsClient(t, serverSocketPath) defer conn.Close() @@ -93,8 +93,8 @@ end } func TestListConflictFilesFailedPrecondition(t *testing.T) { - server, serverSocketPath := runConflictsServer(t) - defer server.Stop() + stop, serverSocketPath := runConflictsServer(t) + defer stop() client, conn := NewConflictsClient(t, serverSocketPath) defer conn.Close() @@ -158,8 +158,8 @@ func TestListConflictFilesFailedPrecondition(t *testing.T) { } func TestFailedListConflictFilesRequestDueToValidation(t *testing.T) { - server, serverSocketPath := runConflictsServer(t) - defer server.Stop() + stop, serverSocketPath := runConflictsServer(t) + defer stop() client, conn := NewConflictsClient(t, serverSocketPath) defer conn.Close() |