Update travis.t to use Test::Execute

1 files changed, 27 insertions, 64 deletions

diff --git a/t/travis.t b/t/travis.t
index 41809ef..5168a5a 100755
--- a/t/travis.t
+++ b/t/travis.t
@@ -6,6 +6,9 @@ use warnings FATAL => 'all';
 use Test::More;
 use Capture::Tiny qw/ capture_merged /;
 use FindBin '$RealBin';
+use lib $RealBin;
+use lib "$RealBin/../SBO-Lib/lib";
+use Test::Execute;
 
 if (defined $ENV{TRAVIS} and $ENV{TRAVIS} eq 'true') {
 	plan tests => 26;
@@ -14,80 +17,38 @@ if (defined $ENV{TRAVIS} and $ENV{TRAVIS} eq 'true') {
 }
 $ENV{TEST_ONLINE} //= 0;
 
-my $lib = "$RealBin/../SBO-Lib/lib";
-my $path = "$RealBin/..";
-
-sub run {
-	my %args = (
-		exit => 0,
-		cmd => [],
-		input => undef,
-		test => 1,
-		expected => undef,
-		name => undef,
-		@_
-	);
-	my $cmd = shift @{ $args{cmd} };
-	return undef unless defined $cmd;
-	my @cmd = ($^X, "-I$lib", "$path/$cmd", @{ $args{cmd} });
-	my $exit = $args{exit};
-	my ($output, $return) = capture_merged {
-		my $ret;
-		if (defined(my $input = $args{input})) {
-			$ret = system(qw/bash -c/, "@cmd <<END\n$input\nEND\n") && $? >> 8;
-		}
-		else {
-			$ret = system(@cmd) && $? >> 8;
-		}
-		$ret;
-	};
-	return unless $args{test};
-
-	my $name = $args{name} // "Testing run of $cmd (@{ $args{cmd} })";
-	subtest $name => sub {
-		plan tests => 2;
-
-		is ($return, $exit, "$cmd (@{ $args{cmd} }) exited with correct exitcode");
-
-		my $expected = $args{expected};
-		if (defined $expected and ref $expected eq 'Regexp') {
-			like ($output, $expected, "$cmd produced the correct output");
-		} else {
-			is ($output, $expected, "$cmd produced the correct output");
-		}
-	};
-}
+$path = "$RealBin/../";
 
 # 1-3: Test SLACKWARE_VERSION
-run (cmd => [qw/ sboconfig -V 14.1 /], expected => "Setting SLACKWARE_VERSION to 14.1...\n");
+script (qw/ sboconfig -V 14.1 /, { expected => "Setting SLACKWARE_VERSION to 14.1...\n" });
 SKIP: {
 	skip 'Not doing online tests without TEST_ONLINE=1', 2 if $ENV{TEST_ONLINE} ne '1';
 
-	run (cmd => [qw/ sbosnap fetch /], expected => "Pulling SlackBuilds tree...\n");
-	run (cmd => [qw/ sbofind sbotools /], expected => "SBo:    sbotools\nPath:   /usr/sbo/repo/system/sbotools\n\n");
+	script (qw/ sbosnap fetch /, { expected => "Pulling SlackBuilds tree...\n" });
+	script (qw/ sbofind sbotools /, { expected => "SBo:    sbotools\nPath:   /usr/sbo/repo/system/sbotools\n\n" });
 }
 
 # 4-10: Test alternative REPO
 is (system(qw!rm -rf /usr/sbo!), 0, 'Removing /usr/sbo works');
 ok (! -e "/usr/sbo/repo/SLACKBUILDS.TXT", "SLACKBUILDS.TXT doesn't exist");
-run (cmd => [qw! sboconfig -r https://github.com/Ponce/slackbuilds.git !], expected => "Setting REPO to https://github.com/Ponce/slackbuilds.git...\n", name => 'Alternative REPO');
+script (qw! sboconfig -r https://github.com/Ponce/slackbuilds.git !, { expected => "Setting REPO to https://github.com/Ponce/slackbuilds.git...\n", name => 'Alternative REPO' });
 SKIP: {
 	skip 'Not doing online tests without TEST_ONLINE=1', 4 if $ENV{TEST_ONLINE} ne '1';
 
-	run (cmd => [qw/ sbosnap fetch /], expected => qr!Pulling SlackBuilds tree.*Cloning into '/usr/sbo/repo'!s);
+	script (qw/ sbosnap fetch /, { expected => qr!Pulling SlackBuilds tree.*Cloning into '/usr/sbo/repo'!s });
 	ok (-e "/usr/sbo/repo/SLACKBUILDS.TXT", "SLACKBUILDS.TXT exists (REPO)");
 	ok (! -e "/usr/sbo/repo/SLACKBUILDS.TXT.gz", "SLACKBUILDS.TXT.gz doesn't exist (REPO)");
-	run (cmd => [qw/ sbofind sbotools /], expected => "SBo:    sbotools\nPath:   /usr/sbo/repo/system/sbotools\n\n");
+	script (qw/ sbofind sbotools /, { expected => "SBo:    sbotools\nPath:   /usr/sbo/repo/system/sbotools\n\n" });
 }
 
 # 11-17: Test local overrides
-run (cmd => [qw/ sboconfig -o /, "$RealBin/LO"], expected => "Setting LOCAL_OVERRIDES to $RealBin/LO...\n", name => 'LOCAL_OVERRIDES');
+script (qw/ sboconfig -o /, "$RealBin/LO", { expected => "Setting LOCAL_OVERRIDES to $RealBin/LO...\n", name => 'LOCAL_OVERRIDES' });
 my $skip = 0;
 SKIP: {
 	if ($ENV{TEST_ONLINE} ne '1') { $skip = !(system(qw! mkdir -p /usr/sbo/repo !) == 0 and system(qw! touch /usr/sbo/repo/SLACKBUILDS.TXT !) == 0) }
 	skip "Online testing disabled (TEST_ONLINE!=1) and could not create dummy SLACKBUILDS.TXT", 9 if $skip;
 
-	run (cmd => [qw/ sbofind nonexistentslackbuild /], expected => <<"LOCAL");
+	script (qw/ sbofind nonexistentslackbuild /, { expected => <<"LOCAL" });
 Local:  nonexistentslackbuild5
 Path:   /home/travis/build/pink-mist/sbotools/t/LO/nonexistentslackbuild5
 
@@ -101,15 +62,15 @@ Local:  nonexistentslackbuild
 Path:   $RealBin/LO/nonexistentslackbuild
 
 LOCAL
-	run (cmd => [qw/ sboinstall -r nonexistentslackbuild /],
-		expected => qr/nonexistentslackbuild added to install queue[.].*perf[.]dummy' saved.*Cleaning for nonexistentslackbuild-1[.]0/s);
-	run (cmd => [qw/ sboremove --nointeractive nonexistentslackbuild /], expected => qr/Removing 1 package\(s\).*nonexistentslackbuild.*All operations have completed/s);
+	script (qw/ sboinstall -r nonexistentslackbuild /,
+		{ expected => qr/nonexistentslackbuild added to install queue[.].*perf[.]dummy' saved.*Cleaning for nonexistentslackbuild-1[.]0/s });
+	script (qw/ sboremove --nointeractive nonexistentslackbuild /, { expected => qr/Removing 1 package\(s\).*nonexistentslackbuild.*All operations have completed/s });
 	is (system(qw!/sbin/installpkg nonexistentslackbuild-0.9-noarch-1_SBo.tgz!), 0, 'Old version fake installed');
-	run (cmd => [qw/ sbocheck /], expected => qr/Updating SlackBuilds tree.*Checking for updated SlackBuilds.*nonexistentslackbuild 0[.]9.*needs updating/s);
-	run (cmd => [qw/ sboupgrade -r nonexistentslackbuild /], expected => qr/nonexistentslackbuild added to upgrade queue.*Upgrade queue: nonexistentslackbuild/s);
+	script (qw/ sbocheck /, { expected => qr/Updating SlackBuilds tree.*Checking for updated SlackBuilds.*nonexistentslackbuild 0[.]9.*needs updating/s });
+	script (qw/ sboupgrade -r nonexistentslackbuild /, { expected => qr/nonexistentslackbuild added to upgrade queue.*Upgrade queue: nonexistentslackbuild/s });
 
 # 18: Test missing dep
-	run(cmd => [qw/ sboinstall nonexistentslackbuild2 /], input => 'y', exit => 1, expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\n");
+	script (qw/ sboinstall nonexistentslackbuild2 /, { input => 'y', exit => 1, expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\n" });
 }
 
 # 19-23: Test sboupgrade --all
@@ -126,24 +87,26 @@ SKIP: {
 	skip 'Cannot test if nonexistentslackbuild is already installed', 4 if @files;
 
 	is (system(qw!/sbin/installpkg nonexistentslackbuild-0.9-noarch-1_SBo.tgz!), 0, 'installpkg old version works');
-	run (cmd => [qw/ sboupgrade -r --all /], expected => qr/Checking for updated SlackBuilds.*nonexistentslackbuild added to upgrade queue.*Cleaning for nonexistentslackbuild/s);
+	script (qw/ sboupgrade -r --all /, { expected => qr/Checking for updated SlackBuilds.*nonexistentslackbuild added to upgrade queue.*Cleaning for nonexistentslackbuild/s });
 	ok (-e "/var/log/packages/nonexistentslackbuild-1.0-noarch-1_SBo", 'updated package is installed');
 	ok (! -e  "/var/log/packages/nonexistentslackbuild-0.9-noarch-1_SBo", 'old package is removed');
 }
 
 if (not glob("/var/log/packages/nonexistentslackbuild-*")) {
-	run (cmd => [qw/ sboinstall -r nonexistentslackbuild /], test => 0);
+	script (qw/ sboinstall -r nonexistentslackbuild /, { test => 0 });
 }
 if (not glob("/var/log/packages/nonexistentslackbuild4-*")) {
-	run (cmd => [qw/ sboinstall nonexistentslackbuild4 /], input => "y\ny\ny", test => 0);
+	script (qw/ sboinstall nonexistentslackbuild4 /, { input => "y\ny\ny", test => 0 });
 }
 # 24-25: Test sboupgrade -f
-run (cmd => [qw/ sboupgrade -f nonexistentslackbuild /], input => "y\ny", expected => qr/Proceed with nonexistentslackbuild\?.*Upgrade queue: nonexistentslackbuild\n/s);
-run (cmd => [qw/ sboupgrade -f nonexistentslackbuild4 /], input => "y\ny", expected => qr/Proceed with nonexistentslackbuild4\?.*Upgrade queue: nonexistentslackbuild4\n/s);
+script (qw/ sboupgrade -f nonexistentslackbuild /, { input => "y\ny", expected => qr/Proceed with nonexistentslackbuild\?.*Upgrade queue: nonexistentslackbuild\n/s });
+script (qw/ sboupgrade -f nonexistentslackbuild4 /, { input => "y\ny", expected => qr/Proceed with nonexistentslackbuild4\?.*Upgrade queue: nonexistentslackbuild4\n/s });
 
 # 26: Test sboupgrade -f -z
-run (cmd => [qw/ sboupgrade -f -z nonexistentslackbuild4 /], input => "y\ny\ny",
-	expected => qr/nonexistentslackbuild5 added to upgrade queue.*nonexistentslackbuild4 added to upgrade queue.*Upgrade queue: nonexistentslackbuild5 nonexistentslackbuild4\n/s);
+script (qw/ sboupgrade -f -z nonexistentslackbuild4 /, {
+	input => "y\ny\ny",
+	expected => qr/nonexistentslackbuild5 added to upgrade queue.*nonexistentslackbuild4 added to upgrade queue.*Upgrade queue: nonexistentslackbuild5 nonexistentslackbuild4\n/s
+});
 
 # Cleanup
 capture_merged {