isync

commit 991e809c389a85bb17cb1e4341df226c0c3812a8
parent 2da7951fe085b2e837e606b4c051d276f32666b3
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Wed, 29 Mar 2017 16:24:55 +0200

autotest: factor out readfile() function

Diffstat:
M
src/run-tests.pl
 | 
15
+++++++++++----

1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/run-tests.pl b/src/run-tests.pl
@@ -605,6 +605,16 @@ sub printchan($)
 	printstate(@{ $$cs[2] });
 }
 
+sub readfile($)
+{
+	my ($file) = @_;
+
+	open(FILE, $file) or return;
+	my @nj = <FILE>;
+	close FILE;
+	return @nj;
+}
+
 # $title, \@source_state, \@target_state, @channel_configs
 sub test($$$@)
 {
@@ -632,10 +642,7 @@ sub test($$$@)
 		exit 1;
 	}
 
-	open(FILE, "<", "slave/.mbsyncstate.journal") or
-		die "Cannot read journal.\n";
-	my @nj = <FILE>;
-	close FILE;
+	my @nj = readfile("slave/.mbsyncstate.journal");
 	($xc, @ret) = runsync("-0 --no-expunge");
 	if ($xc || ckstate("slave/.mbsyncstate", @{ $$tx[2] })) {
 		print "Journal replay failed.\n";