1 files changed, 32 insertions, 26 deletions

diff --git a/test/60-comirror-setup.t b/test/60-comirror-setup.t
index 469b290..a3ac27c 100755
--- a/test/60-comirror-setup.t
+++ b/test/60-comirror-setup.t
@@ -3,15 +3,10 @@ use strict;
 use warnings;
 use 5.010;
 use Cwd;
-use Test::More tests => 9;
+use Test::More tests => 18;
 use Test::Cmd;
 
-my $test = Test::Cmd->new( prog => 'bin/comirror-setup', workdir => q{} );
-my $cwd  = $test->workdir();
-
-my $next_base = 'file://' . getcwd() . '/test/next-loop';
-my ($str, $exit);
-my @links;
+my $test;
 
 sub check_key {
 	my ($filetype, $key, $value) = @_;
@@ -26,31 +21,42 @@ sub check_key {
 	}
 }
 
-ok($test, 'Create Test::Cmd object');
+for my $test_type (qw/loop unicroak/) {
 
-$exit = $test->run(
-	chdir => $cwd
-);
+	$test = Test::Cmd->new( prog => 'bin/comirror-setup', workdir => q{} );
+	my $cwd  = $test->workdir();
 
-ok($exit != 0, 'Not enough arguments: non-zero return');
+	my $next_base = 'file://' . getcwd() . "/test/next-${test_type}";
+	my ($str, $exit);
+	my @links;
 
-is  ($test->stdout, q{}, 'Not enough arguments: Nothing to stdout');
-isnt($test->stderr, q{}, 'Not enough arguments: Something to stderr');
+	ok($test, 'Create Test::Cmd object');
 
-for my $i (1 .. 5) {
-	push(@links, "${next_base}/${i}.xhtml");
-}
+	$exit = $test->run(
+		chdir => $cwd
+	);
+
+	ok($exit != 0, 'Not enough arguments: non-zero return');
+
+	is  ($test->stdout, q{}, 'Not enough arguments: Nothing to stdout');
+	isnt($test->stderr, q{}, 'Not enough arguments: Something to stderr');
 
-$exit = $test->run(
-	chdir => $cwd,
-	args => '--batch ' . join(q{ }, @links[0, 1, 3]),
-);
+	for my $i (1 .. 5) {
+		push(@links, "${next_base}/${i}.xhtml");
+	}
+
+	$exit = $test->run(
+		chdir => $cwd,
+		args => '--batch ' . join(q{ }, @links[0, 1, 3]),
+	);
 
-ok($exit == 0, 'Correct usage: return zero');
+	ok($exit == 0, 'Correct usage: return zero');
 
-isnt($test->stdout, q{}, 'Correct usage: Something to stdout');
-is  ($test->stderr, q{}, 'Correct usage: Nothing to stderr');
+	isnt($test->stdout, q{}, 'Correct usage: Something to stdout');
+	is  ($test->stderr, q{}, 'Correct usage: Nothing to stderr');
 
-check_key('state', 'uri', $links[0]);
+	check_key('state', 'uri', $links[0]);
 
-check_key('conf', 'image_re', "${next_base}/.+");
+	check_key('conf', 'image_re', "${next_base}/.+");
+
+}