diff options
Diffstat (limited to 'internal/service/operations/submodules_test.go')
| -rw-r--r-- | internal/service/operations/submodules_test.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/internal/service/operations/submodules_test.go b/internal/service/operations/submodules_test.go index ec1b1ba5b..a86930f44 100644 --- a/internal/service/operations/submodules_test.go +++ b/internal/service/operations/submodules_test.go @@ -14,10 +14,10 @@ import ( ) func TestSuccessfulUserUpdateSubmoduleRequest(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) @@ -81,10 +81,10 @@ func TestSuccessfulUserUpdateSubmoduleRequest(t *testing.T) { } func TestFailedUserUpdateSubmoduleRequestDueToValidations(t *testing.T) { - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, _, cleanup := testhelper.NewTestRepo(t) @@ -209,10 +209,10 @@ func TestFailedUserUpdateSubmoduleRequestDueToInvalidBranch(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, _, cleanup := testhelper.NewTestRepo(t) @@ -236,10 +236,10 @@ func TestFailedUserUpdateSubmoduleRequestDueToInvalidSubmodule(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, _, cleanup := testhelper.NewTestRepo(t) @@ -263,10 +263,10 @@ func TestFailedUserUpdateSubmoduleRequestDueToSameReference(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, _, cleanup := testhelper.NewTestRepo(t) @@ -293,10 +293,10 @@ func TestFailedUserUpdateSubmoduleRequestDueToRepositoryEmpty(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - server, serverSocketPath := runOperationServiceServer(t) + server, serverSocketPath := testhelper.RunOpSvcServer(t, NewServer) defer server.Stop() - client, conn := NewOperationClient(t, serverSocketPath) + client, conn := testhelper.NewOpSvcCli(t, serverSocketPath) defer conn.Close() testRepo, _, cleanup := testhelper.InitRepoWithWorktree(t) |