From 95120696633ae3fcb24de1eafd06cf32cfdfbb5d Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Fri, 17 Nov 2023 13:07:54 -0500 Subject: [PATCH] fix(store/v2): update PM Test (#18501) --- store/pruning/manager.go | 1 + store/pruning/manager_test.go | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/store/pruning/manager.go b/store/pruning/manager.go index ea94589cf8..3440af2ea1 100644 --- a/store/pruning/manager.go +++ b/store/pruning/manager.go @@ -114,6 +114,7 @@ func (m *Manager) Prune(height uint64) { }() } default: + m.logger.Debug("storage pruning is still running; skipping", "version", pruneHeight) } } } diff --git a/store/pruning/manager_test.go b/store/pruning/manager_test.go index c48a72c66c..072eafd3e6 100644 --- a/store/pruning/manager_test.go +++ b/store/pruning/manager_test.go @@ -26,14 +26,17 @@ func TestPruningTestSuite(t *testing.T) { } func (s *PruningTestSuite) SetupTest() { - noopLog := log.NewNopLogger() + logger := log.NewNopLogger() + if testing.Verbose() { + logger = log.NewTestLogger(s.T()) + } ss, err := sqlite.New(s.T().TempDir()) s.Require().NoError(err) - sc := iavl.NewIavlTree(dbm.NewMemDB(), noopLog, iavl.DefaultConfig()) + sc := iavl.NewIavlTree(dbm.NewMemDB(), log.NewNopLogger(), iavl.DefaultConfig()) - s.manager = NewManager(noopLog, ss, sc) + s.manager = NewManager(logger, ss, sc) s.ss = ss s.sc = sc } @@ -44,10 +47,8 @@ func (s *PruningTestSuite) TearDownTest() { } func (s *PruningTestSuite) TestPruning() { - s.T().SkipNow() - s.manager.SetCommitmentOptions(Options{4, 2, true}) - s.manager.SetStorageOptions(Options{3, 3, false}) + s.manager.SetStorageOptions(Options{3, 3, true}) s.manager.Start() latestVersion := uint64(100) @@ -80,7 +81,7 @@ func (s *PruningTestSuite) TestPruning() { // check the store for the version 50 val, err = s.ss.Get("", 50, []byte("key")) - s.Require().NoError(err) + s.Require().Error(err) s.Require().Nil(val) // check the commitment for the version 96