Skip to content

test(): correct mock client type and remove deprecated ClusterName field in tests #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shreesha001 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test(): correct mock client type and remove deprecated ClusterName field in tests #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions service/access_control_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package service
import (
"context"
"fmt"
"testing"

"github.com/kubeslice/kubeslice-controller/metrics"
metricMock "github.com/kubeslice/kubeslice-controller/metrics/mocks"
"testing"

ossEvents "github.com/kubeslice/kubeslice-controller/events"
"github.com/kubeslice/kubeslice-controller/service/mocks"
Expand Down Expand Up @@ -1270,7 +1271,7 @@ func ACS_ReconcileWorkerClusterServiceAccountAndRoleBindings(t *testing.T) {
mMock.AssertExpectations(t)
}

func prepareACSTestContext(ctx context.Context, client util.Client,
func prepareACSTestContext(ctx context.Context, client *utilMock.Client,
scheme *runtime.Scheme) context.Context {
if scheme == nil {
scheme = runtime.NewScheme()
Expand Down
2 changes: 1 addition & 1 deletion service/namespace_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func TestDeleteNamespace_DoesNothingIfNamespaceDoNotExist(t *testing.T) {
mMock.AssertExpectations(t)
}

func prepareNamespaceTestContext(ctx context.Context, client util.Client, scheme *runtime.Scheme) context.Context {
func prepareNamespaceTestContext(ctx context.Context, client *utilMock.Client, scheme *runtime.Scheme) context.Context {
eventRecorder := events.NewEventRecorder(client, scheme, ossEvents.EventsMap, events.EventRecorderOptions{
Version: "v1alpha1",
Cluster: util.ClusterController,
Expand Down
2 changes: 1 addition & 1 deletion service/project_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func setupProjectTest(name string, namespace string) (*mocks.INamespaceService,
return nsServiceMock, acsServicemOCK, projectService, requestObj, clientMock, project, ctx, clusterServiceMock, sliceConfigServiceMock, serviceExportConfigServiceMock, sliceQoSConfigServiceMock, mMock
}

func prepareProjectTestContext(ctx context.Context, client util.Client,
func prepareProjectTestContext(ctx context.Context, client *utilMock.Client,
scheme *runtime.Scheme) context.Context {
Comment on lines +279 to 280
eventRecorder := events.NewEventRecorder(client, scheme, ossEvents.EventsMap, events.EventRecorderOptions{
Version: "v1alpha1",
Expand Down
1 change: 0 additions & 1 deletion service/worker_slice_gateway_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,6 @@ func testNodeIpReconciliationOfWorkerSliceGatewaysExists(t *testing.T) {
Annotations: nil,
OwnerReferences: nil,
Finalizers: nil,
ClusterName: "",
ManagedFields: nil,
},
Spec: controllerv1alpha1.ClusterSpec{},
Expand Down