X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Ftoss_test.go;h=a5687a72c0a18b5663b432fd06ac019f56c760ac;hb=535d386941ae38abbaa8e1a6df69a5e739058011;hp=c40c9d8628779ffe5b5855f0922b05575d930c3c;hpb=8c96237da230cf7306d2cc460164879d6d1bbce4;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/toss_test.go b/src/cypherpunks.ru/nncp/toss_test.go
index c40c9d8..a5687a7 100644
--- a/src/cypherpunks.ru/nncp/toss_test.go
+++ b/src/cypherpunks.ru/nncp/toss_test.go
@@ -63,7 +63,8 @@ func TestTossEmail(t *testing.T) {
 		defer os.RemoveAll(spool)
 		nodeOur, err := NewNodeGenerate()
 		if err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		ctx := Ctx{
 			Spool:   spool,
@@ -82,7 +83,8 @@ func TestTossEmail(t *testing.T) {
 			}
 			our, err := NewNodeGenerate()
 			if err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 			privates[recipient] = our
 			ctx.Neigh[*our.Id] = our.Their()
@@ -95,7 +97,8 @@ func TestTossEmail(t *testing.T) {
 				[]byte{123},
 				1<<15,
 			); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 		}
 		for _, recipient := range recipients {
@@ -105,12 +108,12 @@ func TestTossEmail(t *testing.T) {
 			if len(dirFiles(rxPath)) == 0 {
 				continue
 			}
-			ctx.Toss(ctx.Self.Id, DefaultNiceMail-1, false)
+			ctx.Toss(ctx.Self.Id, DefaultNiceMail-1, false, false)
 			if len(dirFiles(rxPath)) == 0 {
 				return false
 			}
 			ctx.Neigh[*nodeOur.Id].Sendmail = []string{"/bin/sh", "-c", "false"}
-			ctx.Toss(ctx.Self.Id, DefaultNiceMail, false)
+			ctx.Toss(ctx.Self.Id, DefaultNiceMail, false, false)
 			if len(dirFiles(rxPath)) == 0 {
 				return false
 			}
@@ -118,7 +121,7 @@ func TestTossEmail(t *testing.T) {
 				"/bin/sh", "-c",
 				fmt.Sprintf("cat >> %s", filepath.Join(spool, "mbox")),
 			}
-			ctx.Toss(ctx.Self.Id, DefaultNiceMail, false)
+			ctx.Toss(ctx.Self.Id, DefaultNiceMail, false, false)
 			if len(dirFiles(rxPath)) != 0 {
 				return false
 			}
@@ -158,7 +161,8 @@ func TestTossFile(t *testing.T) {
 		defer os.RemoveAll(spool)
 		nodeOur, err := NewNodeGenerate()
 		if err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		ctx := Ctx{
 			Spool:   spool,
@@ -185,17 +189,18 @@ func TestTossFile(t *testing.T) {
 				fileName,
 				1<<15,
 			); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 		}
 		rxPath := filepath.Join(spool, ctx.Self.Id.String(), string(TRx))
 		os.Rename(filepath.Join(spool, ctx.Self.Id.String(), string(TTx)), rxPath)
-		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false, false)
 		if len(dirFiles(rxPath)) == 0 {
 			return false
 		}
 		ctx.Neigh[*nodeOur.Id].Incoming = &incomingPath
-		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false, false)
 		if len(dirFiles(rxPath)) != 0 {
 			return false
 		}
@@ -227,7 +232,8 @@ func TestTossFileSameName(t *testing.T) {
 		defer os.RemoveAll(spool)
 		nodeOur, err := NewNodeGenerate()
 		if err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		ctx := Ctx{
 			Spool:   spool,
@@ -245,7 +251,8 @@ func TestTossFileSameName(t *testing.T) {
 			[]byte("doesnotmatter"),
 			os.FileMode(0600),
 		); err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		incomingPath := filepath.Join(spool, "incoming")
 		for i := 0; i < files; i++ {
@@ -256,13 +263,14 @@ func TestTossFileSameName(t *testing.T) {
 				"samefile",
 				1<<15,
 			); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 		}
 		rxPath := filepath.Join(spool, ctx.Self.Id.String(), string(TRx))
 		os.Rename(filepath.Join(spool, ctx.Self.Id.String(), string(TTx)), rxPath)
 		ctx.Neigh[*nodeOur.Id].Incoming = &incomingPath
-		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFile, false, false)
 		expected := make(map[string]struct{})
 		expected["samefile"] = struct{}{}
 		for i := 0; i < files-1; i++ {
@@ -296,7 +304,8 @@ func TestTossFreq(t *testing.T) {
 		defer os.RemoveAll(spool)
 		nodeOur, err := NewNodeGenerate()
 		if err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		ctx := Ctx{
 			Spool:   spool,
@@ -323,19 +332,20 @@ func TestTossFreq(t *testing.T) {
 				fileName,
 				1<<15,
 			); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 		}
 		rxPath := filepath.Join(spool, ctx.Self.Id.String(), string(TRx))
 		txPath := filepath.Join(spool, ctx.Self.Id.String(), string(TTx))
 		os.Rename(txPath, rxPath)
 		os.MkdirAll(txPath, os.FileMode(0700))
-		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false, false)
 		if len(dirFiles(txPath)) != 0 || len(dirFiles(rxPath)) == 0 {
 			return false
 		}
 		ctx.Neigh[*nodeOur.Id].Freq = &spool
-		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false, false)
 		if len(dirFiles(txPath)) != 0 || len(dirFiles(rxPath)) == 0 {
 			return false
 		}
@@ -348,7 +358,7 @@ func TestTossFreq(t *testing.T) {
 				panic(err)
 			}
 		}
-		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false)
+		ctx.Toss(ctx.Self.Id, DefaultNiceFreq, false, false)
 		if len(dirFiles(txPath)) == 0 || len(dirFiles(rxPath)) != 0 {
 			return false
 		}
@@ -356,11 +366,13 @@ func TestTossFreq(t *testing.T) {
 			var buf bytes.Buffer
 			_, _, err := PktEncRead(ctx.Self, ctx.Neigh, job.Fd, &buf)
 			if err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 			var pkt Pkt
 			if _, err = xdr.Unmarshal(&buf, &pkt); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 			dst := string(pkt.Path[:int(pkt.PathLen)])
 			if bytes.Compare(buf.Bytes(), files[dst]) != 0 {
@@ -395,7 +407,8 @@ func TestTossTrns(t *testing.T) {
 		defer os.RemoveAll(spool)
 		nodeOur, err := NewNodeGenerate()
 		if err != nil {
-			panic(err)
+			t.Error(err)
+			return false
 		}
 		ctx := Ctx{
 			Spool:   spool,
@@ -430,7 +443,8 @@ func TestTossTrns(t *testing.T) {
 				bytes.NewReader(data),
 				&dst,
 			); err != nil {
-				panic(err)
+				t.Error(err)
+				return false
 			}
 			checksum := blake2b.Sum256(dst.Bytes())
 			if err := ioutil.WriteFile(
@@ -441,7 +455,7 @@ func TestTossTrns(t *testing.T) {
 				panic(err)
 			}
 		}
-		ctx.Toss(ctx.Self.Id, 123, false)
+		ctx.Toss(ctx.Self.Id, 123, false, false)
 		if len(dirFiles(rxPath)) != 0 {
 			return false
 		}