zfs: fixup 6fcf0635a5: broken test

This commit is contained in:
Christian Schwarz 2018-10-19 17:13:32 +02:00
parent 8cfeeee23a
commit 3e359aaeda

View File

@ -138,6 +138,7 @@ size 10518512
name: "fullSend", in: fullSend, name: "fullSend", in: fullSend,
exp: &DrySendInfo{ exp: &DrySendInfo{
Type: DrySendTypeFull, Type: DrySendTypeFull,
Filesystem: "zroot/test/a",
From: "", From: "",
To: "zroot/test/a@1", To: "zroot/test/a@1",
SizeEstimate: 5389768, SizeEstimate: 5389768,
@ -147,6 +148,7 @@ size 10518512
name: "incSend", in: incSend, name: "incSend", in: incSend,
exp: &DrySendInfo{ exp: &DrySendInfo{
Type: DrySendTypeIncremental, Type: DrySendTypeIncremental,
Filesystem: "zroot/test/a",
From: "zroot/test/a@1", From: "zroot/test/a@1",
To: "zroot/test/a@2", To: "zroot/test/a@2",
SizeEstimate: 5383936, SizeEstimate: 5383936,
@ -156,6 +158,7 @@ size 10518512
name: "incSendBookmark", in: incSendBookmark, name: "incSendBookmark", in: incSendBookmark,
exp: &DrySendInfo{ exp: &DrySendInfo{
Type: DrySendTypeIncremental, Type: DrySendTypeIncremental,
Filesystem: "zroot/test/a",
From: "zroot/test/a#1", From: "zroot/test/a#1",
To: "zroot/test/a@2", To: "zroot/test/a@2",
SizeEstimate: 5383312, SizeEstimate: 5383312,
@ -163,18 +166,21 @@ size 10518512
}, },
{ {
name: "incNoToken", in: incNoToken, name: "incNoToken", in: incNoToken,
//exp: &DrySendInfo{ exp: &DrySendInfo{
// Type: DrySendTypeIncremental, Type: DrySendTypeIncremental,
// From: "1", // yes, this is actually correct on ZoL 0.7.11 Filesystem: "zroot/test/a",
// To: "zroot/test/a@2", // as can be seen in the string incNoToken,
// SizeEstimate: 10511856, // we cannot infer whether the incremental source is a snapshot or bookmark
//}, From: "1", // yes, this is actually correct on ZoL 0.7.11
expErr: true, To: "zroot/test/a@2",
SizeEstimate: 10511856,
},
}, },
{ {
name: "fullNoToken", in: fullNoToken, name: "fullNoToken", in: fullNoToken,
exp: &DrySendInfo{ exp: &DrySendInfo{
Type: DrySendTypeFull, Type: DrySendTypeFull,
Filesystem: "zroot/test/a",
From: "", From: "",
To: "zroot/test/a@3", To: "zroot/test/a@3",
SizeEstimate: 10518512, SizeEstimate: 10518512,