From 21f6ba334a6918103b7c37bf45c6a93e40f151ad Mon Sep 17 00:00:00 2001 From: Kyle Maas Date: Mon, 26 Dec 2022 14:49:27 +0000 Subject: [PATCH 1/2] Fix TestIndexFixtures --- multilogs/indexspeed_test.go | 5 ----- multilogs/integration_prep.bash | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/multilogs/indexspeed_test.go b/multilogs/indexspeed_test.go index 9b2d9144..3bb22032 100644 --- a/multilogs/indexspeed_test.go +++ b/multilogs/indexspeed_test.go @@ -21,7 +21,6 @@ import ( librarian "github.com/ssbc/margaret/indexes" "github.com/ssbc/margaret/multilog" - "github.com/ssbc/go-ssb/internal/testutils" "github.com/ssbc/go-ssb/repo" refs "github.com/ssbc/go-ssb-refs" "github.com/ssbc/go-ssb-refs/tfk" @@ -78,10 +77,6 @@ func TestIndexFixtures(t *testing.T) { r := require.New(t) a := assert.New(t) - if testutils.SkipOnCI(t) { - return - } - f, err := os.Open("v2-sloop-authors.json") r.NoError(err) var feedsSloop tFeedSet diff --git a/multilogs/integration_prep.bash b/multilogs/integration_prep.bash index e3877bc9..82f79205 100644 --- a/multilogs/integration_prep.bash +++ b/multilogs/integration_prep.bash @@ -27,4 +27,4 @@ rm -r testrun mkdir -p tmp/unpack tar xf v2-sloop-m100000-a2000.tar.gz -C tmp/unpack -go run go.cryptoscope.co/ssb/cmd/ssb-offset-converter -if lfo tmp/unpack/flume/log.offset $dest \ No newline at end of file +go run ../cmd/ssb-offset-converter -if lfo tmp/unpack/flume/log.offset $dest From f47c072d8a51930ee5947426f7ba39806903cc95 Mon Sep 17 00:00:00 2001 From: Kyle Maas Date: Tue, 27 Dec 2022 12:27:04 +0000 Subject: [PATCH 2/2] Fix download script so it properly runs the first time and errors out on failure --- multilogs/integration_prep.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/multilogs/integration_prep.bash b/multilogs/integration_prep.bash index 82f79205..7bb00a3d 100644 --- a/multilogs/integration_prep.bash +++ b/multilogs/integration_prep.bash @@ -16,8 +16,10 @@ test "$dest" != "" || { sha256sum -c v2-sloop-m100000-a2000.tar.gz.shasum || { wget "https://github.com/ssb-ngi-pointer/ssb-fixtures/releases/download/2.3.0/v2-sloop-m100000-a2000.tar.gz" - echo 'rerun me' - exit 0 + sha256sum -c v2-sloop-m100000-a2000.tar.gz.shasum || { + echo 'download of ssb-fixtures failed' + exit 1 + } }