Skip to content
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

Jump to bottom

test: replace gomonkey with xgo in submodule chaosmeta-inject-operator #163

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

test: replace gomonkey with xgo in submodule chaosmeta-inject-operator #163

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
7 changes: 4 additions & 3 deletions chaosmeta-inject-operator/controllers/experiment_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ package controllers
import (
"context"
"fmt"
"github.com/agiledragon/gomonkey"
"testing"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/api/v1alpha1"
mockscopehandler "github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/mock/scopehandler"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/model"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/scopehandler"
"github.com/xhd2015/xgo/runtime/mock"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"
)

func Test_solveRange(t *testing.T) {
Expand Down Expand Up @@ -164,7 +165,7 @@ func Test_initProcess(t *testing.T) {
scopeHandlerMock := mockscopehandler.NewMockScopeHandler(ctrl)
scopeHandlerMock.EXPECT().ConvertSelector(ctx, &exp.Spec).Return(reObject, nil)

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down
1 change: 1 addition & 0 deletions chaosmeta-inject-operator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/onsi/gomega v1.24.1
github.com/stretchr/testify v1.8.0
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5
github.com/xhd2015/xgo/runtime v1.0.12
k8s.io/api v0.26.0
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.0
Expand Down
2 changes: 2 additions & 0 deletions chaosmeta-inject-operator/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5 h1:1RpFVSqiERGKUq2Yc6nioKEa0VyCXu0+t9vXpmK1WQ4=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5/go.mod h1:291sLBmT/cXwucSh4T3kRmLX7JRlSNq5HY66PQtt4ow=
github.com/xhd2015/xgo/runtime v1.0.12 h1:oPFv8qYEI+RvcT6frK7ffYwyeZhL9AeDhxvBYBSs494=
github.com/xhd2015/xgo/runtime v1.0.12/go.mod h1:Z9uVy/NhTPeR3pvQoOdRvlYnSosJvrM7BySVGPsht6o=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down
15 changes: 8 additions & 7 deletions chaosmeta-inject-operator/pkg/executor/cloudnativeexecutor/clusterpendingpod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ package cloudnativeexecutor

import (
"context"
"github.com/agiledragon/gomonkey"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/api/v1alpha1"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/common"
"testing"
"time"
"github.com/xhd2015/xgo/runtime/mock"
)

func TestClusterPendingPodExecutor_Inject(t *testing.T) {
Expand All @@ -36,10 +37,10 @@ func TestClusterPendingPodExecutor_Inject(t *testing.T) {
{Key: "name", Value: podname},
}

gomonkey.ApplyFunc(createNs, func(ctx context.Context, name string) error {
mock.Patch(createNs, func(ctx context.Context, name string) error {
return nil
})
gomonkey.ApplyFunc(createPendingPod, func(ctx context.Context, namespace, name string) error {
mock.Patch(createPendingPod, func(ctx context.Context, namespace, name string) error {
return nil
})

Expand All @@ -49,12 +50,12 @@ func TestClusterPendingPodExecutor_Inject(t *testing.T) {
assert.Equal(t, err, nil)
assert.Equal(t, common.GetClusterCtrl().IsRunning(), false)

gomonkey.ApplyFunc(createPendingPod, func(ctx context.Context, namespace, name string) error {
mock.Patch(createPendingPod, func(ctx context.Context, namespace, name string) error {
time.Sleep(10 * time.Second)
return nil
})

gomonkey.ApplyFunc(deleteNs, func(ctx context.Context, name string) error {
mock.Patch(deleteNs, func(ctx context.Context, name string) error {
return nil
})

Expand Down
15 changes: 8 additions & 7 deletions chaosmeta-inject-operator/pkg/phasehandler/inject/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ package injecthandler
import (
"context"
"fmt"
"github.com/agiledragon/gomonkey"
"testing"
"time"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/api/v1alpha1"
mockscopehandler "github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/mock/scopehandler"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/common"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/model"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/scopehandler"
"testing"
"time"
"github.com/xhd2015/xgo/runtime/mock"
)

func TestInjectPhaseHandler_SolveCreated_OneToRunning(t *testing.T) {
Expand Down Expand Up @@ -105,7 +106,7 @@ func TestInjectPhaseHandler_SolveCreated_OneToRunning(t *testing.T) {
scopeHandlerMock.EXPECT().GetInjectObject(ctx, exp.Spec.Experiment, reContainer.GetObjectName()).Return(re, nil)
scopeHandlerMock.EXPECT().ExecuteInject(ctx, re, exp.Status.Detail.Inject[0].UID, exp.Spec.Experiment).Return("", nil)

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down Expand Up @@ -214,7 +215,7 @@ func TestInjectPhaseHandler_SolveCreated_OneInjectFailedInTwo(t *testing.T) {
scopeHandlerMock.EXPECT().ExecuteInject(ctx, re1, exp.Status.Detail.Inject[0].UID, exp.Spec.Experiment).Return("", fmt.Errorf("expected fail"))
scopeHandlerMock.EXPECT().ExecuteInject(ctx, re2, exp.Status.Detail.Inject[1].UID, exp.Spec.Experiment).Return("", nil)

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down Expand Up @@ -355,7 +356,7 @@ func TestInjectPhaseHandler_SolveRunning_TwoQueryFailedInThree(t *testing.T) {
Message: "task run failed",
}, nil)

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down Expand Up @@ -469,7 +470,7 @@ func TestInjectPhaseHandler_SolveRunning_TwoFailed(t *testing.T) {
scopeHandlerMock.EXPECT().QueryExperiment(ctx, re1, exp.Status.Detail.Inject[0].UID, "", exp.Spec.Experiment, v1alpha1.InjectPhaseType).Return(nil, fmt.Errorf("expected fail"))
scopeHandlerMock.EXPECT().QueryExperiment(ctx, re2, exp.Status.Detail.Inject[1].UID, "", exp.Spec.Experiment, v1alpha1.InjectPhaseType).Return(nil, fmt.Errorf("expected fail"))

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down
11 changes: 6 additions & 5 deletions chaosmeta-inject-operator/pkg/phasehandler/recover/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ package recoverhandler
import (
"context"
"fmt"
"github.com/agiledragon/gomonkey"
"testing"
"time"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/api/v1alpha1"
mockscopehandler "github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/mock/scopehandler"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/common"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/model"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/scopehandler"
"testing"
"time"
"github.com/xhd2015/xgo/runtime/mock"
)

func TestRecoverPhaseHandler_SolveCreated_OneToRunning(t *testing.T) {
Expand Down Expand Up @@ -113,7 +114,7 @@ func TestRecoverPhaseHandler_SolveCreated_OneToRunning(t *testing.T) {
scopeHandlerMock := mockscopehandler.NewMockScopeHandler(ctrl)
scopeHandlerMock.EXPECT().GetInjectObject(ctx, exp.Spec.Experiment, reContainer.GetObjectName()).Return(re, nil)
scopeHandlerMock.EXPECT().ExecuteRecover(ctx, re, exp.Status.Detail.Inject[0].UID, "", exp.Spec.Experiment).Return(nil)
gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down Expand Up @@ -237,7 +238,7 @@ func TestRecoverPhaseHandler_SolveRunning(t *testing.T) {
scopeHandlerMock.EXPECT().QueryExperiment(ctx, re1, exp.Status.Detail.Inject[0].UID, "", exp.Spec.Experiment, v1alpha1.RecoverPhaseType).Return(nil, fmt.Errorf("expected fail"))
scopeHandlerMock.EXPECT().QueryExperiment(ctx, re2, exp.Status.Detail.Inject[1].UID, "", exp.Spec.Experiment, v1alpha1.RecoverPhaseType).Return(nil, fmt.Errorf("expected fail"))

gomonkey.ApplyFunc(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
mock.Patch(scopehandler.GetScopeHandler, func(v1alpha1.ScopeType) scopehandler.ScopeHandler {
return scopeHandlerMock
})

Expand Down
3 changes: 2 additions & 1 deletion chaosmeta-inject-operator/pkg/scopehandler/pod/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ package pod

import (
"context"
"testing"

"github.com/agiledragon/gomonkey"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/api/v1alpha1"
mockselector "github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/mock/selector"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/model"
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/selector"
"testing"
)

func TestPodScopeHandler_ConvertSelector(t *testing.T) {
Expand Down