From 99836f05e798011391019a0144bd836134ee8aec Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 16 Jul 2021 10:58:29 -0700 Subject: [PATCH] test: use leveldb instead of badger Badger has issues on 32bit operating systems. --- pstoreds/addr_book_gc_test.go | 10 +++++----- pstoreds/ds_test.go | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pstoreds/addr_book_gc_test.go b/pstoreds/addr_book_gc_test.go index e21f43f..82e5127 100644 --- a/pstoreds/addr_book_gc_test.go +++ b/pstoreds/addr_book_gc_test.go @@ -43,7 +43,7 @@ func TestGCLookahead(t *testing.T) { opts.GCLookaheadInterval = 10 * time.Second opts.GCPurgeInterval = 1 * time.Second - factory := addressBookFactory(t, badgerStore, opts) + factory := addressBookFactory(t, leveldbStore, opts) ab, closeFn := factory() gc := ab.(*dsAddrBook).gc defer closeFn() @@ -90,7 +90,7 @@ func TestGCPurging(t *testing.T) { opts.GCLookaheadInterval = 20 * time.Second opts.GCPurgeInterval = 1 * time.Second - factory := addressBookFactory(t, badgerStore, opts) + factory := addressBookFactory(t, leveldbStore, opts) ab, closeFn := factory() gc := ab.(*dsAddrBook).gc defer closeFn() @@ -157,7 +157,7 @@ func TestGCDelay(t *testing.T) { opts.GCLookaheadInterval = 1 * time.Minute opts.GCPurgeInterval = 30 * time.Second - factory := addressBookFactory(t, badgerStore, opts) + factory := addressBookFactory(t, leveldbStore, opts) ab, closeFn := factory() defer closeFn() @@ -188,7 +188,7 @@ func TestGCLookaheadDisabled(t *testing.T) { opts.GCLookaheadInterval = 0 // disable lookahead opts.GCPurgeInterval = 9 * time.Hour - factory := addressBookFactory(t, badgerStore, opts) + factory := addressBookFactory(t, leveldbStore, opts) ab, closeFn := factory() defer closeFn() @@ -232,7 +232,7 @@ func BenchmarkLookaheadCycle(b *testing.B) { opts.GCLookaheadInterval = 2 * time.Hour opts.GCPurgeInterval = 6 * time.Hour - factory := addressBookFactory(b, badgerStore, opts) + factory := addressBookFactory(b, leveldbStore, opts) ab, closeFn := factory() defer closeFn() diff --git a/pstoreds/ds_test.go b/pstoreds/ds_test.go index 8727077..9287e53 100644 --- a/pstoreds/ds_test.go +++ b/pstoreds/ds_test.go @@ -18,8 +18,8 @@ import ( type datastoreFactory func(tb testing.TB) (ds.Batching, func()) var dstores = map[string]datastoreFactory{ - "Badger": badgerStore, - // "Leveldb": leveldbStore, + //"Badger": badgerStore, + "Leveldb": leveldbStore, } func TestDsPeerstore(t *testing.T) { @@ -87,6 +87,8 @@ func BenchmarkDsPeerstore(b *testing.B) { } } +// Doesn't work on 32bit because badger. +//lint:ignore U1000 disabled for now func badgerStore(tb testing.TB) (ds.Batching, func()) { dataPath, err := ioutil.TempDir(os.TempDir(), "badger") if err != nil { @@ -103,8 +105,7 @@ func badgerStore(tb testing.TB) (ds.Batching, func()) { return store, closer } -//lint:ignore U1000 disabled for now -func leveldbStore(tb testing.TB) (ds.TxnDatastore, func()) { +func leveldbStore(tb testing.TB) (ds.Batching, func()) { dataPath, err := ioutil.TempDir(os.TempDir(), "leveldb") if err != nil { tb.Fatal(err)