Merge pull request ssbc#283 from KyleMaas/update-testindexfixtures

Update TestIndexFixtures to ssb-fixtures 3.0.2

.gitignore

@@ -28,3 +28,6 @@ dist
 
 # ignore go coverage reports
 **/cover.out
+
+# ignore downloaded files for tests
+multilogs/v3-sloop-m100000-a2000.tar.gz

multilogs/indexspeed_test.go

@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"testing"
 	"time"
+	"log"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -77,12 +78,17 @@ func TestIndexFixtures(t *testing.T) {
 	r := require.New(t)
 	a := assert.New(t)
 
-	f, err := os.Open("v2-sloop-authors.json")
-	r.NoError(err)
+	outputList := false
+	f, err := os.Open("v3-sloop-authors.json")
 	var feedsSloop tFeedSet
-	err = json.NewDecoder(f).Decode(&feedsSloop)
-	r.NoError(err)
-	f.Close()
+	if err == nil {
+		err = json.NewDecoder(f).Decode(&feedsSloop)
+		r.NoError(err)
+		f.Close()
+	} else {
+		t.Log("log", t.Name(), "authors not found - this test will fail but will result in an authors file being generated")
+		outputList = true
+	}
 
 	testRepo := filepath.Join("testrun", t.Name())
 
@@ -124,6 +130,43 @@ func TestIndexFixtures(t *testing.T) {
 	// f, err := os.Create("/tmp/lengthfile")
 	// r.NoError(err)
 
+	if outputList {
+		// write out a list of authors and exit
+		authors := make(map[string]int64)
+
+		ml, combinedSnk, closer := setupCombinedIndex(t, testLog, makeFsMlog)
+		serve("combined", combinedSnk)
+
+		addrs, err := ml.List()
+		r.NoError(err)
+
+		for i, addr := range addrs {
+			var sr tfk.Feed
+			err := sr.UnmarshalBinary([]byte(addr))
+			r.NoError(err, "ref %d invalid", i)
+
+			sublog, err := ml.Get(addr)
+			r.NoError(err)
+
+			sublogSeq := sublog.Seq()
+
+			fr, err := sr.Feed()
+			r.NoError(err)
+
+			authors[fr.String()] = sublogSeq
+			log.Printf("setting %s to %d", fr.String(), sublogSeq)
+		}
+		log.Printf("writing authors")
+		r.NoError(testLog.Close())
+		f, err := os.OpenFile("v3-sloop-authors.json", os.O_WRONLY|os.O_CREATE, 0644)
+		r.NoError(err)
+		err = json.NewEncoder(f).Encode(authors)
+		r.NoError(err)
+		f.Close()
+		r.NoError(closer.Close())
+		return
+	}
+
 	compare := func(ml multilog.MultiLog) {
 		addrs, err := ml.List()
 		r.NoError(err)

multilogs/integration_prep.bash

@@ -13,10 +13,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"
+sha256sum -c v3-sloop-m100000-a2000.tar.gz.shasum || {
+    wget "https://github.com/ssbc/ssb-fixtures/releases/download/3.0.2/v3-sloop-m100000-a2000.tar.gz"
 
-    sha256sum -c v2-sloop-m100000-a2000.tar.gz.shasum || {
+    sha256sum -c v3-sloop-m100000-a2000.tar.gz.shasum || {
         echo 'download of ssb-fixtures failed'
         exit 1
     }
@@ -27,6 +27,6 @@ rm -r tmp
 rm -r testrun
 
 mkdir -p tmp/unpack
-tar xf v2-sloop-m100000-a2000.tar.gz -C tmp/unpack
+tar xf v3-sloop-m100000-a2000.tar.gz -C tmp/unpack
 
 go run ../cmd/ssb-offset-converter -if lfo tmp/unpack/flume/log.offset $dest

multilogs/v3-sloop-m100000-a2000.tar.gz.shasum

@@ -0,0 +1 @@
+091540dcb7cbd9f548c129bc8665e52fd8ccd59d13f4245a6d695428462b8874  v3-sloop-m100000-a2000.tar.gz