WIP2 logging done somewhat

2018-08-10 17:06:00 +02:00
parent 74445a0017
commit c1f3076eb3
14 changed files with 573 additions and 397 deletions
@@ -51,131 +51,131 @@ func (m *MockIncrementalPathRecorder) Finished() bool {
 	return m.Pos == len(m.Sequence)
 }

-type DiscardCopier struct{}
-
-func (DiscardCopier) Copy(writer io.Writer, reader io.Reader) (int64, error) {
-	return 0, nil
-}
-
-type IncrementalPathReplicatorTest struct {
-	Msg        string
-	Filesystem *replication.Filesystem
-	Path       []*replication.FilesystemVersion
-	Steps      []IncrementalPathSequenceStep
-}
-
-func (test *IncrementalPathReplicatorTest) Test(t *testing.T) {
-
-	t.Log(test.Msg)
-
-	rec := &MockIncrementalPathRecorder{
-		T:        t,
-		Sequence: test.Steps,
-	}
-
-	ctx := context.WithValue(context.Background(), replication.ContextKeyLog, testLog{t})
-
-	ipr := replication.NewIncrementalPathReplicator()
-	ipr.Replicate(
-		ctx,
-		rec,
-		rec,
-		DiscardCopier{},
-		test.Filesystem,
-		test.Path,
-	)
-
-	assert.True(t, rec.Finished())
-
-}
+//type IncrementalPathReplicatorTest struct {
+//	Msg        string
+//	Filesystem *replication.Filesystem
+//	Path       []*replication.FilesystemVersion
+//	Steps      []IncrementalPathSequenceStep
+//}
+//
+//func (test *IncrementalPathReplicatorTest) Test(t *testing.T) {
+//
+//	t.Log(test.Msg)
+//
+//	rec := &MockIncrementalPathRecorder{
+//		T:        t,
+//		Sequence: test.Steps,
+//	}
+//
+//	ctx := replication.ContextWithLogger(context.Background(), testLog{t})
+//
+//	ipr := replication.NewIncrementalPathReplicator()
+//	ipr.Replicate(
+//		ctx,
+//		rec,
+//		rec,
+//		DiscardCopier{},
+//		test.Filesystem,
+//		test.Path,
+//	)
+//
+//	assert.True(t, rec.Finished())
+//
+//}

 type testLog struct {
 	t *testing.T
 }

-func (t testLog) Printf(fmt string, args ...interface{}) {
+var _ replication.Logger = testLog{}
+
+func (t testLog) Infof(fmt string, args ...interface{}) {
+	t.t.Logf(fmt, args)
+}
+func (t testLog) Errorf(fmt string, args ...interface{}) {
 	t.t.Logf(fmt, args)
 }

-func TestIncrementalPathReplicator_Replicate(t *testing.T) {

-	tbl := []IncrementalPathReplicatorTest{
-		{
-			Msg: "generic happy place with resume token",
-			Filesystem: &replication.Filesystem{
-				Path:        "foo/bar",
-				ResumeToken: "blafoo",
-			},
-			Path: fsvlist("@a,1", "@b,2", "@c,3"),
-			Steps: []IncrementalPathSequenceStep{
-				{
-					SendRequest: &replication.SendReq{
-						Filesystem:  "foo/bar",
-						From:        "@a,1",
-						To:          "@b,2",
-						ResumeToken: "blafoo",
-					},
-					SendResponse: &replication.SendRes{
-						UsedResumeToken: true,
-					},
-				},
-				{
-					ReceiveRequest: &replication.ReceiveReq{
-						Filesystem:  "foo/bar",
-						ClearResumeToken: false,
-					},
-				},
-				{
-					SendRequest: &replication.SendReq{
-						Filesystem: "foo/bar",
-						From:       "@b,2",
-						To:         "@c,3",
-					},
-				},
-				{
-					ReceiveRequest: &replication.ReceiveReq{
-						Filesystem: "foo/bar",
-					},
-				},
-			},
-		},
-		{
-			Msg: "no action on empty sequence",
-			Filesystem: &replication.Filesystem{
-				Path: "foo/bar",
-			},
-			Path:  fsvlist(),
-			Steps: []IncrementalPathSequenceStep{},
-		},
-		{
-			Msg: "full send on single entry path",
-			Filesystem: &replication.Filesystem{
-				Path: "foo/bar",
-			},
-			Path:  fsvlist("@justone,1"),
-			Steps: []IncrementalPathSequenceStep{
-				{
-					SendRequest: &replication.SendReq{
-						Filesystem: "foo/bar",
-						From: "@justone,1",
-						To: "", // empty means full send
-					},
-					SendResponse: &replication.SendRes{
-						UsedResumeToken: false,
-					},
-				},
-				{
-					ReceiveRequest: &replication.ReceiveReq{
-						Filesystem: "foo/bar",
-						ClearResumeToken: false,
-					},
-				},
-			},
-		},
-	}
-
-	for _, test := range tbl {
-		test.Test(t)
-	}
-
-}
+//func TestIncrementalPathReplicator_Replicate(t *testing.T) {
+//
+//	tbl := []IncrementalPathReplicatorTest{
+//		{
+//			Msg: "generic happy place with resume token",
+//			Filesystem: &replication.Filesystem{
+//				Path:        "foo/bar",
+//				ResumeToken: "blafoo",
+//			},
+//			Path: fsvlist("@a,1", "@b,2", "@c,3"),
+//			Steps: []IncrementalPathSequenceStep{
+//				{
+//					SendRequest: &replication.SendReq{
+//						Filesystem:  "foo/bar",
+//						From:        "@a,1",
+//						To:          "@b,2",
+//						ResumeToken: "blafoo",
+//					},
+//					SendResponse: &replication.SendRes{
+//						UsedResumeToken: true,
+//					},
+//				},
+//				{
+//					ReceiveRequest: &replication.ReceiveReq{
+//						Filesystem:  "foo/bar",
+//						ClearResumeToken: false,
+//					},
+//				},
+//				{
+//					SendRequest: &replication.SendReq{
+//						Filesystem: "foo/bar",
+//						From:       "@b,2",
+//						To:         "@c,3",
+//					},
+//				},
+//				{
+//					ReceiveRequest: &replication.ReceiveReq{
+//						Filesystem: "foo/bar",
+//					},
+//				},
+//			},
+//		},
+//		{
+//			Msg: "no action on empty sequence",
+//			Filesystem: &replication.Filesystem{
+//				Path: "foo/bar",
+//			},
+//			Path:  fsvlist(),
+//			Steps: []IncrementalPathSequenceStep{},
+//		},
+//		{
+//			Msg: "full send on single entry path",
+//			Filesystem: &replication.Filesystem{
+//				Path: "foo/bar",
+//			},
+//			Path:  fsvlist("@justone,1"),
+//			Steps: []IncrementalPathSequenceStep{
+//				{
+//					SendRequest: &replication.SendReq{
+//						Filesystem: "foo/bar",
+//						From: "@justone,1",
+//						To: "", // empty means full send
+//					},
+//					SendResponse: &replication.SendRes{
+//						UsedResumeToken: false,
+//					},
+//				},
+//				{
+//					ReceiveRequest: &replication.ReceiveReq{
+//						Filesystem: "foo/bar",
+//						ClearResumeToken: false,
+//					},
+//				},
+//			},
+//		},
+//	}
+//
+//	for _, test := range tbl {
+//		test.Test(t)
+//	}
+//
+//}