From 41eb3129ae0fbe1dc177d9dbbd5ab6bb3917da97 Mon Sep 17 00:00:00 2001 From: Alejandro Lopez Date: Fri, 14 Apr 2023 12:16:14 +0300 Subject: [PATCH] [#139] Refactor blobovnicza exist test to not use chmod Signed-off-by: Alejandro Lopez --- internal/logs/logs.go | 2 +- pkg/innerring/processors/netmap/process_peers.go | 2 +- .../blobstor/blobovniczatree/exists_test.go | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/logs/logs.go b/internal/logs/logs.go index 83acedfb..06253874 100644 --- a/internal/logs/logs.go +++ b/internal/logs/logs.go @@ -490,7 +490,7 @@ const ( NetmapCantInvokeNetmapUpdatePeer = "can't invoke netmap.UpdatePeer" // Error in ../node/pkg/innerring/processors/netmap/process_peers.go NetmapNonAlphabetModeIgnoreRemoveNodeFromSubnetNotification = "non alphabet mode, ignore remove node from subnet notification" // Info in ../node/pkg/innerring/processors/netmap/process_peers.go NetmapCouldNotGetNetworkMapCandidates = "could not get network map candidates" // Warn in ../node/pkg/innerring/processors/netmap/process_peers.go - NetmapCouldNotUnmarshalSubnetId = "could not unmarshal subnet id" // Warn in ../node/pkg/innerring/processors/netmap/process_peers.go + NetmapCouldNotUnmarshalSubnetID = "could not unmarshal subnet id" // Warn in ../node/pkg/innerring/processors/netmap/process_peers.go NetmapGotZeroSubnetInRemoveNodeNotification = "got zero subnet in remove node notification" // Warn in ../node/pkg/innerring/processors/netmap/process_peers.go NetmapCouldNotIterateOverSubnetworksOfTheNode = "could not iterate over subnetworks of the node" // Warn in ../node/pkg/innerring/processors/netmap/process_peers.go NetmapCouldNotInvokeNetmapUpdateState = "could not invoke netmap.UpdateState" // Error in ../node/pkg/innerring/processors/netmap/process_peers.go diff --git a/pkg/innerring/processors/netmap/process_peers.go b/pkg/innerring/processors/netmap/process_peers.go index ffaad3b4..130d0856 100644 --- a/pkg/innerring/processors/netmap/process_peers.go +++ b/pkg/innerring/processors/netmap/process_peers.go @@ -159,7 +159,7 @@ func (np *Processor) processRemoveSubnetNode(ev subnetEvent.RemoveNode) { err = subnetToRemoveFrom.Unmarshal(rawSubnet) if err != nil { - np.log.Warn(logs.NetmapCouldNotUnmarshalSubnetId, + np.log.Warn(logs.NetmapCouldNotUnmarshalSubnetID, zap.Error(err), ) return diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go index 08fd2223..0c7c61d7 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go @@ -53,10 +53,11 @@ func TestExistsInvalidStorageID(t *testing.T) { t.Run("invalid storage id", func(t *testing.T) { storageID := slice.Copy(putRes.StorageID) storageID[0] = '9' - badDir := filepath.Join(dir, "9") - require.NoError(t, os.MkdirAll(badDir, os.ModePerm)) - require.NoError(t, os.Chmod(badDir, 0)) - t.Cleanup(func() { _ = os.Chmod(filepath.Join(dir, "9"), os.ModePerm) }) + + // An invalid boltdb file is created so that it returns an error when opened + badFileDir := filepath.Join(dir, "9", "0") + require.NoError(t, os.MkdirAll(badFileDir, os.ModePerm)) + require.NoError(t, os.WriteFile(filepath.Join(badFileDir, "0"), []byte("not a boltdb file content"), 0777)) res, err := b.Exists(context.Background(), common.ExistsPrm{Address: addr, StorageID: storageID}) require.Error(t, err)