From 6fc44cfde4882052efb0388242de4c37ed591806 Mon Sep 17 00:00:00 2001 From: Roman Perekhod Date: Wed, 2 Oct 2024 13:18:41 +0200 Subject: [PATCH] fix the nil pointer in the integration tests --- pkg/storage/utils/decomposedfs/decomposedfs.go | 7 ++++++- tests/integration/grpc/storageprovider_test.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go index a73e4375b66..8a83fab3886 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs.go @@ -1284,9 +1284,14 @@ func (fs *Decomposedfs) refFromNode(ctx context.Context, n *node.Node, storageId func (fs *Decomposedfs) publishEvent(ctx context.Context, evf func() (any, error)) { log := appctx.GetLogger(ctx) + if fs.stream == nil { + log.Error().Msg("Failed to publish event, stream is undefined") + return + } ev, err := evf() - if err != nil { + if err != nil || ev == nil { log.Error().Err(err).Msg("Failed to crete the event") + return } if err := events.Publish(ctx, fs.stream, ev); err != nil { log.Error().Err(err).Msg("Failed to publish event") diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index 9f2082b6565..02a889ecfd9 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -264,8 +264,9 @@ var _ = Describe("storage providers", func() { targetRef := &storagep.Reference{ResourceId: subdirRef.ResourceId, Path: "/new_subdir"} res, err := providerClient.Move(ctx, &storagep.MoveRequest{Source: subdirRef, Destination: targetRef}) - Expect(res.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) + Expect(err).ToNot(HaveOccurred()) + Expect(res.GetStatus().GetCode()).To(Equal(rpcv1beta1.Code_CODE_OK)) statRes, err = providerClient.Stat(ctx, &storagep.StatRequest{Ref: subdirRef}) Expect(err).ToNot(HaveOccurred())