diff options
| -rwxr-xr-x | t/07-fail.t | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/t/07-fail.t b/t/07-fail.t index 6798446..cd1fa7c 100755 --- a/t/07-fail.t +++ b/t/07-fail.t @@ -7,11 +7,11 @@ use Test::More; use Capture::Tiny qw/ capture_merged /; use FindBin '$RealBin'; use lib $RealBin; -use Test::Sbotools qw/ make_slackbuilds_txt set_lo set_repo sboinstall sboremove sbosnap restore_perf_dummy sboupgrade /; +use Test::Sbotools qw/ make_slackbuilds_txt set_lo set_repo sboconfig sboinstall sboremove sbosnap restore_perf_dummy sboupgrade /; use File::Temp 'tempdir'; if ($ENV{TEST_INSTALL}) { - plan tests => 28; + plan tests => 24; } else { plan skip_all => 'Only run these tests if TEST_INSTALL=1'; } @@ -86,6 +86,8 @@ make_slackbuilds_txt(); set_lo("$RealBin/LO-fail"); restore_perf_dummy(); +sboconfig '--gpg-key FALSE', { test => 0 }; + # 1: Failing slackbuild script sboinstall 'failingslackbuild', { input => "y\ny", expected => qr/Failures:\n failingslackbuild: failingslackbuild.SlackBuild return non-zero\n\z/, exit => 3 }; @@ -181,41 +183,13 @@ sboinstall qw/ -r noreadmebutreadmereq /, { test => 0 }; sboremove qw/ noreadmebutreadmereq /, { input => "y\nn", expected => qr/Unable to open README for noreadmebutreadmereq[.]/s, exit => 0 }; sboremove qw/ noreadmebutreadmereq /, { input => "n\ny\ny", expected => qr/Display README.*Remove noreadme.*Added to remove queue.*Removing 1 pack.*noreadme.*All operations/s, exit => 0 }; -# 25: compat32 should fail for a perl sbo -SKIP: { - skip "This test is designed to be run in the Travis CI environment", 1 unless $ENV{TRAVIS}; - - my $dir = tempdir(CLEANUP => 1); - set_repo("file://$dir"); - capture_merged { system(<<"END"); }; -cd "$dir"; -git init; -mkdir perl -cp -a "$RealBin/LO/perl-nonexistentcpan" perl -git add . -git commit -m 'added perl-nonexistentcpan' -END - sbosnap 'fetch', { test => 0 }; - - sboinstall qw/ -p perl-nonexistentcpan /, { expected => "-p|--compat32 is not supported with Perl SBos.\n", exit => 1 }; -} - -# 26: compat32 for malformed-readme fail -SKIP: { - skip "Multilib convertpkg fail test only valid if TEST_MULTILIB=2", 1 unless $ENV{TEST_MULTILIB} == 2; - skip "No /etc/profile.d/32dev.sh", 1 unless -e "/etc/profile.d/32dev.sh"; - skip "No /usr/sbin/convertpkg-compat32", 1 unless -e "/usr/sbin/convertpkg-compat32"; - - sboinstall qw/ -p malformed-readme /, { expected => sub { m/\QUnable to open README for malformed-readme.\E\n/ and m/\Qmalformed-readme-compat32 requires malformed-readme.\E\n/ }, exit => 6 }; -} - -# 27: sboupgrade with -r and -z +# 25: sboupgrade with -r and -z set_lo "$RealBin/LO"; sboinstall qw/ -r nonexistentslackbuild /, { test => 0 }; set_lo "$RealBin/LO2"; sboupgrade qw/ -z -r nonexistentslackbuild /, { exit => 1, expected => "-r|--nointeractive and -z|--force-reqs can not be used together.\n" }; -# 28: sboupgrade nonexistentslackbuildname +# 26: sboupgrade nonexistentslackbuildname sboupgrade 'nonexistentslackbuildname', { exit => 1, expected => "Unable to locate nonexistentslackbuildname in the SlackBuilds.org tree.\n" }; # Cleanup |