Skip to content

Remove unused error flag #51

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

Closed
rytswd wants to merge 1 commit into from
Closed

Remove unused error flag #51

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
35 changes: 11 additions & 24 deletions pkg/resource-handler/controller/etcd/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ func TestBuildHeadlessService(t *testing.T) {
scheme := runtime.NewScheme()
_ = multigresv1alpha1.AddToScheme(scheme)

// NOTE: error path is tested as a part of the reconciliation loop.
tests := map[string]struct {
etcd *multigresv1alpha1.Etcd
scheme *runtime.Scheme
want *corev1.Service
wantErr bool
etcd *multigresv1alpha1.Etcd
scheme *runtime.Scheme
want *corev1.Service
}{
"minimal spec": {
etcd: &multigresv1alpha1.Etcd{
Expand Down Expand Up @@ -151,14 +151,8 @@ func TestBuildHeadlessService(t *testing.T) {
for name, tc := range tests {
t.Run(name, func(t *testing.T) {
got, err := BuildHeadlessService(tc.etcd, tc.scheme)

if (err != nil) != tc.wantErr {
t.Errorf("BuildHeadlessService() error = %v, wantErr %v", err, tc.wantErr)
return
}

if tc.wantErr {
return
if err != nil {
t.Fatalf("BuildHeadlessService() unexpected error: %v", err)
}

if diff := cmp.Diff(tc.want, got); diff != "" {
Expand All @@ -173,10 +167,9 @@ func TestBuildClientService(t *testing.T) {
_ = multigresv1alpha1.AddToScheme(scheme)

tests := map[string]struct {
etcd *multigresv1alpha1.Etcd
scheme *runtime.Scheme
want *corev1.Service
wantErr bool
etcd *multigresv1alpha1.Etcd
scheme *runtime.Scheme
want *corev1.Service
}{
"minimal spec": {
etcd: &multigresv1alpha1.Etcd{
Expand Down Expand Up @@ -293,14 +286,8 @@ func TestBuildClientService(t *testing.T) {
for name, tc := range tests {
t.Run(name, func(t *testing.T) {
got, err := BuildClientService(tc.etcd, tc.scheme)

if (err != nil) != tc.wantErr {
t.Errorf("BuildClientService() error = %v, wantErr %v", err, tc.wantErr)
return
}

if tc.wantErr {
return
if err != nil {
t.Fatalf("BuildClientService() unexpected error: %v", err)
}

if diff := cmp.Diff(tc.want, got); diff != "" {
Expand Down
Loading