Skip to content

Commit bb5ec31

Browse files
avorimaavorima
committed
More error context in controller and identity sanity tests
1 parent df74ae0 commit bb5ec31

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎pkg/sanity/controller.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
202202

203203
serverError, ok := status.FromError(err)
204204
Expect(ok).To(BeTrue())
205-
Expect(serverError.Code()).To(Equal(codes.Aborted))
205+
Expect(serverError.Code()).To(Equal(codes.Aborted), "unexpected error: %s", serverError.Message())
206206
})
207207

208208
It("check the presence of new volumes and absence of deleted ones in the volume list", func() {
@@ -384,7 +384,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
384384

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

390390
It("should fail when no volume capabilities are provided", func() {
@@ -401,7 +401,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
401401

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

407407
// TODO: whether CreateVolume request with no capacity should fail or not depends on driver implementation
@@ -538,7 +538,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
538538
Expect(err).To(HaveOccurred())
539539
serverError, ok := status.FromError(err)
540540
Expect(ok).To(BeTrue())
541-
Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
541+
Expect(serverError.Code()).To(Equal(codes.AlreadyExists), "unexpected error: %s", serverError.Message())
542542
})
543543

544544
It("should not fail when creating volume with maximum-length name", func() {
@@ -610,7 +610,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
610610
Expect(err).To(HaveOccurred())
611611
serverError, ok := status.FromError(err)
612612
Expect(ok).To(BeTrue())
613-
Expect(serverError.Code()).To(Equal(codes.NotFound))
613+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
614614
})
615615

616616
It("should create volume from an existing source volume", func() {
@@ -656,7 +656,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
656656
Expect(err).To(HaveOccurred())
657657
serverError, ok := status.FromError(err)
658658
Expect(ok).To(BeTrue())
659-
Expect(serverError.Code()).To(Equal(codes.NotFound))
659+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
660660
})
661661
})
662662

@@ -679,7 +679,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
679679

680680
serverError, ok := status.FromError(err)
681681
Expect(ok).To(BeTrue())
682-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
682+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
683683
})
684684

685685
It("should succeed when an invalid volume id is used", func() {
@@ -741,7 +741,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
741741

742742
serverError, ok := status.FromError(err)
743743
Expect(ok).To(BeTrue())
744-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
744+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
745745
})
746746

747747
It("should fail when no volume capabilities are provided", func() {
@@ -776,7 +776,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
776776

777777
serverError, ok := status.FromError(err)
778778
Expect(ok).To(BeTrue())
779-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
779+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
780780
})
781781

782782
It("should return appropriate values (no optional values added)", func() {
@@ -837,7 +837,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
837837

838838
serverError, ok := status.FromError(err)
839839
Expect(ok).To(BeTrue())
840-
Expect(serverError.Code()).To(Equal(codes.NotFound))
840+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
841841
})
842842
})
843843

@@ -860,7 +860,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
860860

861861
serverError, ok := status.FromError(err)
862862
Expect(ok).To(BeTrue())
863-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
863+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
864864
})
865865

866866
It("should fail when no node id is provided", func() {
@@ -876,7 +876,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
876876

877877
serverError, ok := status.FromError(err)
878878
Expect(ok).To(BeTrue())
879-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
879+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
880880
})
881881

882882
It("should fail when no volume capability is provided", func() {
@@ -893,7 +893,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
893893

894894
serverError, ok := status.FromError(err)
895895
Expect(ok).To(BeTrue())
896-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
896+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
897897
})
898898

899899
It("should fail when publishing more volumes than the node max attach limit", func() {
@@ -955,7 +955,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
955955

956956
serverError, ok := status.FromError(err)
957957
Expect(ok).To(BeTrue())
958-
Expect(serverError.Code()).To(Equal(codes.NotFound))
958+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
959959
})
960960

961961
It("should fail when the node does not exist", func() {
@@ -994,7 +994,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
994994

995995
serverError, ok := status.FromError(err)
996996
Expect(ok).To(BeTrue())
997-
Expect(serverError.Code()).To(Equal(codes.NotFound))
997+
Expect(serverError.Code()).To(Equal(codes.NotFound), "unexpected error: %s", serverError.Message())
998998
})
999999

10001000
It("should fail when the volume is already published but is incompatible", func() {
@@ -1048,7 +1048,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
10481048

10491049
serverError, ok := status.FromError(err)
10501050
Expect(ok).To(BeTrue())
1051-
Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
1051+
Expect(serverError.Code()).To(Equal(codes.AlreadyExists), "unexpected error: %s", serverError.Message())
10521052
})
10531053
})
10541054

@@ -1087,7 +1087,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
10871087

10881088
serverError, ok := status.FromError(err)
10891089
Expect(ok).To(BeTrue())
1090-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1090+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
10911091
})
10921092
})
10931093
})
@@ -1337,7 +1337,7 @@ var _ = DescribeSanity("DeleteSnapshot [Controller Server]", func(sc *TestContex
13371337

13381338
serverError, ok := status.FromError(err)
13391339
Expect(ok).To(BeTrue())
1340-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1340+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
13411341
})
13421342

13431343
It("should succeed when an invalid snapshot id is used", func() {
@@ -1394,7 +1394,7 @@ var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *TestContex
13941394
Expect(err).To(HaveOccurred())
13951395
serverError, ok := status.FromError(err)
13961396
Expect(ok).To(BeTrue())
1397-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1397+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
13981398
})
13991399

14001400
It("should fail when no source volume id is provided", func() {
@@ -1411,7 +1411,7 @@ var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *TestContex
14111411
Expect(err).To(HaveOccurred())
14121412
serverError, ok := status.FromError(err)
14131413
Expect(ok).To(BeTrue())
1414-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1414+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
14151415
})
14161416

14171417
It("should succeed when requesting to create a snapshot with already existing name and same source volume ID", func() {
@@ -1444,7 +1444,7 @@ var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *TestContex
14441444
Expect(err).To(HaveOccurred())
14451445
serverError, ok := status.FromError(err)
14461446
Expect(ok).To(BeTrue())
1447-
Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
1447+
Expect(serverError.Code()).To(Equal(codes.AlreadyExists), "unexpected error: %s", serverError.Message())
14481448
})
14491449

14501450
It("should succeed when creating snapshot with maximum-length name", func() {
@@ -1500,7 +1500,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *TestContext)
15001500

15011501
serverError, ok := status.FromError(err)
15021502
Expect(ok).To(BeTrue())
1503-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1503+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
15041504
})
15051505

15061506
It("should fail if no capacity range is given", func() {
@@ -1514,7 +1514,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *TestContext)
15141514

15151515
serverError, ok := status.FromError(err)
15161516
Expect(ok).To(BeTrue())
1517-
Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
1517+
Expect(serverError.Code()).To(Equal(codes.InvalidArgument), "unexpected error: %s", serverError.Message())
15181518
})
15191519

15201520
It("should work", func() {

‎pkg/sanity/identity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ var _ = DescribeSanity("Identity Service", func(sc *TestContext) {
8383
serverError, ok := status.FromError(err)
8484
Expect(ok).To(BeTrue())
8585
Expect(serverError.Code() == codes.FailedPrecondition ||
86-
serverError.Code() == codes.OK).To(BeTrue())
86+
serverError.Code() == codes.OK).To(BeTrue(), "unexpected error: %s", serverError.Message())
8787

8888
if res.GetReady() != nil {
8989
Expect(res.GetReady().GetValue() == true ||

0 commit comments

Comments
 (0)