From 21084b010b1e916150e3e53097e4ef904aae9634 Mon Sep 17 00:00:00 2001 From: Dirk McCormick Date: Wed, 7 Jun 2023 14:26:14 +0200 Subject: [PATCH] refactor: remove piece directory couchbase tests --- piecedirectory/doctor_test.go | 32 --------------------------- piecedirectory/piecedirectory_test.go | 28 ----------------------- 2 files changed, 60 deletions(-) diff --git a/piecedirectory/doctor_test.go b/piecedirectory/doctor_test.go index 105546b7f..ba6035f44 100644 --- a/piecedirectory/doctor_test.go +++ b/piecedirectory/doctor_test.go @@ -12,7 +12,6 @@ import ( "github.com/filecoin-project/boost/testutil" "github.com/filecoin-project/boostd-data/client" - "github.com/filecoin-project/boostd-data/couchbase" "github.com/filecoin-project/boostd-data/ldb" "github.com/filecoin-project/boostd-data/model" "github.com/filecoin-project/boostd-data/svc" @@ -60,37 +59,6 @@ func TestPieceDoctor(t *testing.T) { ldb.MinPieceCheckPeriod = prev }) - t.Run("couchbase", func(t *testing.T) { - // TODO: Unskip this test once the couchbase instance can be created - // from a docker container in CI - t.Skip() - - prev := couchbase.MinPieceCheckPeriod - couchbase.MinPieceCheckPeriod = 1 * time.Second - - svc.SetupCouchbase(t, testCouchSettings) - bdsvc := svc.NewCouchbase(testCouchSettings) - - addr := "localhost:8051" - err := bdsvc.Start(ctx, addr) - require.NoError(t, err) - - cl := client.NewStore() - err = cl.Dial(ctx, fmt.Sprintf("ws://%s", addr)) - require.NoError(t, err) - defer cl.Close(ctx) - - t.Run("next pieces", func(t *testing.T) { - testNextPieces(ctx, t, cl, couchbase.MinPieceCheckPeriod) - }) - - t.Run("check pieces", func(t *testing.T) { - testCheckPieces(ctx, t, cl) - }) - - couchbase.MinPieceCheckPeriod = prev - }) - t.Run("yugabyte", func(t *testing.T) { prev := yugabyte.MinPieceCheckPeriod yugabyte.MinPieceCheckPeriod = 1 * time.Second diff --git a/piecedirectory/piecedirectory_test.go b/piecedirectory/piecedirectory_test.go index 5cffe8b07..77d1e143e 100644 --- a/piecedirectory/piecedirectory_test.go +++ b/piecedirectory/piecedirectory_test.go @@ -25,24 +25,6 @@ import ( "github.com/stretchr/testify/require" ) -var testCouchSettings = couchbase.DBSettings{ - ConnectString: "couchbase://localhost", - Auth: couchbase.DBSettingsAuth{ - Username: "Administrator", - Password: "boostdemo", - }, - PieceMetadataBucket: couchbase.DBSettingsBucket{ - RAMQuotaMB: 128, - }, - MultihashToPiecesBucket: couchbase.DBSettingsBucket{ - RAMQuotaMB: 128, - }, - PieceOffsetsBucket: couchbase.DBSettingsBucket{ - RAMQuotaMB: 128, - }, - TestMode: true, -} - func TestPieceDirectory(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second) defer cancel() @@ -55,16 +37,6 @@ func TestPieceDirectory(t *testing.T) { testPieceDirectory(ctx, t, bdsvc, addr) }) - t.Run("couchbase", func(t *testing.T) { - // TODO: Unskip this test once the couchbase instance can be created - // from a docker container in CI as part of the test - t.Skip() - svc.SetupCouchbase(t, testCouchSettings) - bdsvc := svc.NewCouchbase(testCouchSettings) - addr := "localhost:8043" - testPieceDirectory(ctx, t, bdsvc, addr) - }) - t.Run("yugabyte", func(t *testing.T) { svc.SetupYugabyte(t)