sipp11
/
mbsync
mirror of https://git.code.sf.net/p/isync/isync
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

make the error case output more useful by dumping the entire data set.

wip/maildir-uid-dupes-test
Oswald Buddenhagen 19 years ago
parent
549c1cf13e
commit
d68dd7369e
1 changed files with 122 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 195
      src/run-tests.pl

195
src/run-tests.pl
Unescape View File

@ -306,6 +306,71 @@ sub readbox($)
return ($mu, %ms); return ($mu, %ms);
} }
# $boxname
sub showbox($)
{
my ($bn) = @_;
my ($mu, %ms) = readbox($bn);
print " [ $mu,\n ";
my $frst = 1;
for my $num (sort {my ($ca, $cb) = ($ms{$a}[0], $ms{$b}[0]); ($ca?$ca:$a+1000) <=> ($cb?$cb:$b+1000)} keys %ms) {
if ($frst) {
$frst = 0;
} else {
print ", ";
}
print "$num, $ms{$num}[0], \"$ms{$num}[1]\"";
}
print " ],\n";
}
# $num
sub showchan()
{
showbox("master");
showbox("slave");
open(FILE, "<", "slave/.mbsyncstate") or
die "Cannot read sync state.\n";
$_ = <FILE>;
/^1:(\d+) 1:(\d+):(\d+)\n$/;
print " [ $1, $2, $3,\n ";
my $frst = 1;
for (<FILE>) {
if (!/^(-?\d+) (-?\d+) (.*)\n$/) {
print STDERR "Malformed sync state entry '$_'.\n";
next;
}
if ($frst) {
$frst = 0;
} else {
print ", ";
}
print "$1, $2, \"$3\"";
}
print " ],\n";
close FILE;
}
sub show($$@)
{
my ($sx, $tx, @sfx) = @_;
my @sp;
eval "\@sp = \@x$sx";
mkchan($sp[0], $sp[1], @{ $sp[2] });
print "my \@x$sx = (\n";
showchan();
print ");\n";
&runsync(@sfx);
print "my \@X$tx = (\n";
print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ],\n";
showchan();
print ");\n";
print "test(\\\@x$sx, \\\@X$tx);\n\n";
rmtree "slave";
rmtree "master";
}
# $boxname, $maxuid, @msgs # $boxname, $maxuid, @msgs
sub mkbox($$@) sub mkbox($$@)
{ {
@ -350,135 +415,119 @@ sub mkchan($$@)
# $config, $boxname, $maxuid, @msgs # $config, $boxname, $maxuid, @msgs
sub ckbox($$$@) sub ckbox($$$@)
{ {
my ($cfg, $bn, $MU, @MS) = @_; my ($bn, $MU, @MS) = @_;
my ($mu, %ms) = readbox($bn); my ($mu, %ms) = readbox($bn);
if ($mu != $MU) { if ($mu != $MU) {
print STDERR "MAXUID mismatch for $bn - expected $MU, got $mu, config: $cfg\n"; print STDERR "MAXUID mismatch for '$bn'.\n";
exit 1; return 1;
} }
while (@MS) { while (@MS) {
my ($num, $uid, $flg) = (shift @MS, shift @MS, shift @MS); my ($num, $uid, $flg) = (shift @MS, shift @MS, shift @MS);
if (!defined $ms{$num}) { if (!defined $ms{$num}) {
print STDERR "no message $bn:$num, config: $cfg\n"; print STDERR "No message $bn:$num.\n";
exit 1; return 1;
} }
if ($ms{$num}[0] ne $uid) { if ($ms{$num}[0] ne $uid) {
print STDERR "UID mismatch for $bn:$num - expected $uid, got $ms{$num}[0], config: $cfg\n"; print STDERR "UID mismatch for $bn:$num.\n";
exit 1; return 1;
} }
if ($ms{$num}[1] ne $flg) { if ($ms{$num}[1] ne $flg) {
print STDERR "flag mismatch for $bn:$num - expected '$flg', got '$ms{$num}[1]', config: $cfg\n"; print STDERR "Flag mismatch for $bn:$num.\n";
exit 1; return 1;
} }
delete $ms{$num}; delete $ms{$num};
} }
if (%ms) { if (%ms) {
print STDERR "excess messages in '$bn': ".join(", ", sort({$a <=> $b } keys(%ms))).", config: $cfg\n"; print STDERR "Excess messages in '$bn': ".join(", ", sort({$a <=> $b } keys(%ms))).".\n";
exit 1; return 1;
} }
return 0;
} }
# $config, \@master, \@slave, @syncstate # $config, \@master, \@slave, @syncstate
sub ckchan($$$@) sub ckchan($$$@)
{ {
my ($cfg, $M, $S, @T) = @_; my ($cfg, $M, $S, @T) = @_;
my $rslt = 0;
open(FILE, "<", "slave/.mbsyncstate") or open(FILE, "<", "slave/.mbsyncstate") or
die "Cannot read sync state.\n"; die "Cannot read sync state.\n";
my $l = <FILE>; chomp(my $l = <FILE>);
my @ls = <FILE>; chomp(my @ls = <FILE>);
close FILE; close FILE;
my $xl = "1:".shift(@T)." 1:".shift(@T).":".shift(@T)."\n"; my $xl = "1:".shift(@T)." 1:".shift(@T).":".shift(@T);
if ($l ne $xl) { if ($l ne $xl) {
print STDERR "Sync state header mismatch. print STDERR "Sync state header mismatch: '$l' instead of '$xl'.\n";
Expected: $xl"."Got: $l"."Config: $cfg $rslt = 1;
"; } else {
exit 1; for $l (@ls) {
} $xl = shift(@T)." ".shift(@T)." ".shift(@T);
for $l (@ls) { if ($l ne $xl) {
$xl = shift(@T)." ".shift(@T)." ".shift(@T)."\n"; print STDERR "Sync state entry mismatch: '$l' instead of '$xl'.\n";
if ($l ne $xl) { $rslt = 1;
print STDERR "Sync state entry mismatch. last;
Expected: $xl"."Got: $l"."Config: $cfg }
";
exit 1;
} }
} }
&ckbox($cfg, "master", @{ $M }); $rslt |= &ckbox("master", @{ $M });
&ckbox($cfg, "slave", @{ $S }); $rslt |= &ckbox("slave", @{ $S });
} return $rslt;
sub test($$)
{
my ($sx, $tx) = @_;
mkchan($$sx[0], $$sx[1], @{ $$sx[2] });
&runsync(@{ $$tx[0] });
ckchan(fcfg(@{ $$tx[0] }), $$tx[1], $$tx[2], @{ $$tx[3] });
rmtree "slave";
rmtree "master";
} }
# $id, $boxname sub printbox($$@)
sub showbox($$)
{ {
my ($bn) = @_; my ($bn, $mu, @ms) = @_;
my ($mu, %ms) = readbox($bn);
print " [ $mu,\n "; print " [ $mu,\n ";
my $frst = 1; my $frst = 1;
for my $num (sort {my ($ca, $cb) = ($ms{$a}[0], $ms{$b}[0]); ($ca?$ca:$a+1000) <=> ($cb?$cb:$b+1000)} keys %ms) { while (@ms) {
if ($frst) { if ($frst) {
$frst = 0; $frst = 0;
} else { } else {
print ", "; print ", ";
} }
print "$num, $ms{$num}[0], \"$ms{$num}[1]\""; print shift(@ms).", ".shift(@ms).", \"".shift(@ms)."\"";
} }
print " ],\n"; print " ],\n";
} }
# $num sub printchan($$@)
sub showchan()
{ {
&showbox("master"); my ($m, $s, @t) = @_;
&showbox("slave");
open(FILE, "<", "slave/.mbsyncstate") or &printbox("master", @{ $m });
die "Cannot read sync state.\n"; &printbox("slave", @{ $s });
$_ = <FILE>; print " [ ".shift(@t).", ".shift(@t).", ".shift(@t).",\n ";
/^1:(\d+) 1:(\d+):(\d+)\n$/;
print " [ $1, $2, $3,\n ";
my $frst = 1; my $frst = 1;
for (<FILE>) { while (@t) {
if (!/^(-?\d+) (-?\d+) (.*)\n$/) {
print STDERR "Malformed sync state entry '$_'.\n";
next;
}
if ($frst) { if ($frst) {
$frst = 0; $frst = 0;
} else { } else {
print ", "; print ", ";
} }
print "$1, $2, \"$3\""; print shift(@t).", ".shift(@t).", \"".shift(@t)."\"";
} }
print " ],\n"; print " ],\n";
close FILE; close FILE;
} }
sub show($$@) sub test($$)
{ {
my ($sx, $tx, @sfx) = @_; my ($sx, $tx) = @_;
my @sp;
eval "\@sp = \@x$sx"; mkchan($$sx[0], $$sx[1], @{ $$sx[2] });
mkchan($sp[0], $sp[1], @{ $sp[2] }); &runsync(@{ $$tx[0] });
print "my \@x$sx = (\n"; if (ckchan(fcfg(@{ $$tx[0] }), $$tx[1], $$tx[2], @{ $$tx[3] })) {
showchan(); print "Input:\n";
print ");\n"; printchan($$sx[0], $$sx[1], @{ $$sx[2] });
&runsync(@sfx); print "Options:\n";
print "my \@X$tx = (\n"; print " [ ".join(", ", map('"'.qm($_).'"', @{ $$tx[0] }))." ],\n";
print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ],\n"; print "Expected result:\n";
showchan(); printchan($$tx[1], $$tx[2], @{ $$tx[3] });
print ");\n"; print "Actual result:\n";
print "test(\\\@x$sx, \\\@X$tx);\n\n"; showchan();
exit 1;
}
rmtree "slave"; rmtree "slave";
rmtree "master"; rmtree "master";
} }

Write Preview
Loading…
Cancel
Save