.

go/neo/neo_test.go

@@ -49,22 +49,19 @@ func TestMasterStorage(t *testing.T) {
 func tracetestMasterStorage(t0 *tracetest.T) {
 	X := exc.Raiseif
 
-	zstor := xfs1stor("../zodb/storage/fs1/testdata/1.fs")
 	zback := xfs1back("../zodb/storage/fs1/testdata/1.fs")
+	zstor := xfs1stor("../zodb/storage/fs1/testdata/1.fs")
+	lastTid, err := zstor.Sync(bg);  X(err)
 
+	// create the cluster
 	t := tNewCluster_MS(t0, "abc1", zback)
 	defer t.Stop()
 
-	M := t.Master("m")
 	C := t.NewClient("c", "m:1")
 
-	lastTid, err := zstor.Sync(bg);  X(err)
-
 	tM  := t.Checker("m")
-//	tS  := t.Checker("s")
 	tC  := t.Checker("c")
 	tMS := t.Checker("m-s")
-//	tSM := t.Checker("s-m")
 	tCM := t.Checker("c-m")
 	tMC := t.Checker("m-c")
 	tCS := t.Checker("c-s")
@@ -74,64 +71,8 @@ func tracetestMasterStorage(t0 *tracetest.T) {
 	// TODO create C; C tries connect to master - rejected ("not yet operational")
 	// TODO test ID rejects (uuid already registered, ...)
 
-	// XXX convert prologue to tNewCluster_MS
-
-/*
-	// M starts listening
-	tM.Expect(netlisten("m:1"))
-	tM.Expect(δnode("m", "m:1", proto.MASTER, 1, proto.RUNNING, proto.IdTimeNone))
-	tM.Expect(clusterState("m", proto.ClusterRecovering))
-
-
-	// S starts listening
-	tS.Expect(netlisten("s:1"))
-
-
-	// S connects M
-	tSM.Expect(netdial("s", "m:1"))
-	tSM.Expect(netconnect("s:2", "m:2",  "m:1"))
-	tSM.Expect(conntx("s:2", "m:2", 1, &proto.RequestIdentification{
-		NodeType:	proto.STORAGE,
-		UUID:		0,
-		Address:	xnaddr("s:1"),
-		ClusterName:	"abc1",
-		IdTime:		proto.IdTimeNone,
-		DevPath:        nil,
-		NewNID:         nil,
-	}))
-
-
-	tM.Expect(δnode("m", "s:1", proto.STORAGE, 1, proto.PENDING, 0.01))
-
-	tSM.Expect(conntx("m:2", "s:2", 1, &proto.AcceptIdentification{
-		NodeType:	proto.MASTER,
-		MyUUID:		proto.UUID(proto.MASTER, 1),
-		YourUUID:	proto.UUID(proto.STORAGE, 1),
-	}))
-
-	// M starts recovery on S
-	tMS.Expect(conntx("m:2", "s:2", 0, &proto.Recovery{}))
-	tMS.Expect(conntx("s:2", "m:2", 0, &proto.AnswerRecovery{
-		// empty new node
-		PTid:		0,
-		BackupTid:	proto.INVALID_TID,
-		TruncateTid:	proto.INVALID_TID,
-	}))
-
-	tMS.Expect(conntx("m:2", "s:2", 2, &proto.AskPartitionTable{}))
-	tMS.Expect(conntx("s:2", "m:2", 2, &proto.AnswerPartitionTable{
-		PTid:		0,
-		NumReplicas:	0,
-		RowList:	[]proto.RowInfo{},
-	}))
-
-	// M ready to start: new cluster, no in-progress S recovery
-	tM.Expect(masterStartReady("m", true))
-
-	// ----------------------------------------
-*/
-
 	// M <- start cmd
+	M := t.Master("m")
 	wg := xsync.NewWorkGroup(bg)
 	gox(wg, func(ctx context.Context) {
 		err := M.Start();  X(err)