Skip to content

Commit df74ae0

Browse files
avorimaavorima
committed
Provide more context for status code mismatch errors
The default `Expect` error message when comparing gRPC status codes is only somewhat useful on its own. Usually the message contains valuable information to better debug the problem. I only noticed this for a small subset of calls, but I figured it might be useful for the whole file.
1 parent 6d79aac commit df74ae0

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎pkg/sanity/node.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
387387

388388
serverError, ok := status.FromError(err)
389389
Expect(ok).To(BeTrue())
390-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
390+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
391391
})
392392

393393
It("should fail when no target path is provided", func() {
@@ -402,7 +402,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
402402

403403
serverError, ok := status.FromError(err)
404404
Expect(ok).To(BeTrue())
405-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
405+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
406406
})
407407

408408
It("should fail when no volume capability is provided", func() {
@@ -419,7 +419,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
419419

420420
serverError, ok := status.FromError(err)
421421
Expect(ok).To(BeTrue())
422-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
422+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
423423
})
424424
})
425425

@@ -433,7 +433,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
433433

434434
serverError, ok := status.FromError(err)
435435
Expect(ok).To(BeTrue())
436-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
436+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
437437
})
438438

439439
It("should fail when no target path is provided", func() {
@@ -447,7 +447,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
447447

448448
serverError, ok := status.FromError(err)
449449
Expect(ok).To(BeTrue())
450-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
450+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
451451
})
452452
})
453453

@@ -480,7 +480,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
480480

481481
serverError, ok := status.FromError(err)
482482
Expect(ok).To(BeTrue())
483-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
483+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
484484
})
485485

486486
It("should fail when no staging target path is provided", func() {
@@ -499,7 +499,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
499499

500500
serverError, ok := status.FromError(err)
501501
Expect(ok).To(BeTrue())
502-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
502+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
503503
})
504504

505505
It("should fail when no volume capability is provided", func() {
@@ -542,7 +542,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
542542

543543
serverError, ok := status.FromError(err)
544544
Expect(ok).To(BeTrue())
545-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
545+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
546546
})
547547
})
548548

@@ -564,7 +564,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
564564

565565
serverError, ok := status.FromError(err)
566566
Expect(ok).To(BeTrue())
567-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
567+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
568568
})
569569

570570
It("should fail when no staging target path is provided", func() {
@@ -578,7 +578,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
578578

579579
serverError, ok := status.FromError(err)
580580
Expect(ok).To(BeTrue())
581-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
581+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
582582
})
583583
})
584584

@@ -600,7 +600,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
600600

601601
serverError, ok := status.FromError(err)
602602
Expect(ok).To(BeTrue())
603-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
603+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
604604
})
605605

606606
It("should fail when no volume path is provided", func() {
@@ -614,7 +614,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
614614

615615
serverError, ok := status.FromError(err)
616616
Expect(ok).To(BeTrue())
617-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
617+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
618618
})
619619

620620
It("should fail when volume is not found", func() {
@@ -629,7 +629,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
629629

630630
serverError, ok := status.FromError(err)
631631
Expect(ok).To(BeTrue())
632-
Expect(serverError.Code()).To(Equal(codes.NotFound))
632+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
633633
})
634634

635635
It("should fail when volume does not exist on the specified path", func() {
@@ -666,7 +666,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
666666

667667
serverError, ok := status.FromError(err)
668668
Expect(ok).To(BeTrue())
669-
Expect(serverError.Code()).To(Equal(codes.NotFound))
669+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
670670
})
671671

672672
})
@@ -691,7 +691,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
691691

692692
serverError, ok := status.FromError(err)
693693
Expect(ok).To(BeTrue())
694-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
694+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
695695
})
696696

697697
It("should fail when no volume path is provided", func() {
@@ -710,7 +710,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
710710

711711
serverError, ok := status.FromError(err)
712712
Expect(ok).To(BeTrue())
713-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
713+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
714714
})
715715

716716
It("should fail when volume is not found", func() {
@@ -725,7 +725,7 @@ var _ = DescribeSanity("Node Service", func(sc *TestContext) {
725725

726726
serverError, ok := status.FromError(err)
727727
Expect(ok).To(BeTrue())
728-
Expect(serverError.Code()).To(Equal(codes.NotFound))
728+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
729729
})
730730

731731
It("should work if node-expand is called after node-publish", func() {

0 commit comments

Comments
 (0)