From a45734855de8a67cd67afea31c7f28be2a0b0ac4 Mon Sep 17 00:00:00 2001 From: Andreas Guldstrand Date: Thu, 31 Dec 2015 13:03:27 +0100 Subject: Move failure tests to their own testing structure --- t/LO-fail/failingslackbuild/README | 1 + .../failingslackbuild/failingslackbuild.SlackBuild | 15 +++++ t/LO-fail/failingslackbuild/failingslackbuild.info | 10 ++++ t/LO/failingslackbuild/README | 1 - .../failingslackbuild/failingslackbuild.SlackBuild | 15 ----- t/LO/failingslackbuild/failingslackbuild.info | 10 ---- t/fail.t | 66 ++++++++++++++++++++++ t/install.t | 5 +- 8 files changed, 93 insertions(+), 30 deletions(-) create mode 100644 t/LO-fail/failingslackbuild/README create mode 100644 t/LO-fail/failingslackbuild/failingslackbuild.SlackBuild create mode 100644 t/LO-fail/failingslackbuild/failingslackbuild.info delete mode 100644 t/LO/failingslackbuild/README delete mode 100644 t/LO/failingslackbuild/failingslackbuild.SlackBuild delete mode 100644 t/LO/failingslackbuild/failingslackbuild.info create mode 100755 t/fail.t (limited to 't') diff --git a/t/LO-fail/failingslackbuild/README b/t/LO-fail/failingslackbuild/README new file mode 100644 index 0000000..6d388bb --- /dev/null +++ b/t/LO-fail/failingslackbuild/README @@ -0,0 +1 @@ +This doesn't exist! diff --git a/t/LO-fail/failingslackbuild/failingslackbuild.SlackBuild b/t/LO-fail/failingslackbuild/failingslackbuild.SlackBuild new file mode 100644 index 0000000..626bced --- /dev/null +++ b/t/LO-fail/failingslackbuild/failingslackbuild.SlackBuild @@ -0,0 +1,15 @@ +#!/bin/bash +PRGNAM="failingslackbuild" +VERSION=${VERSION:-1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +TMP=${TMP:-/tmp/SBo} +OUTPUT=${OUTPUT:-/tmp} + +mkdir -p $TMP/$PRGNAM-$VERSION +cp README $TMP/$PRGNAM-$VERSION +mkdir -p $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION +cp README $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION +cd $OUTPUT/package-$PRGNAM + +exit 1 diff --git a/t/LO-fail/failingslackbuild/failingslackbuild.info b/t/LO-fail/failingslackbuild/failingslackbuild.info new file mode 100644 index 0000000..5d1991a --- /dev/null +++ b/t/LO-fail/failingslackbuild/failingslackbuild.info @@ -0,0 +1,10 @@ +PRGNAM="failingslackbuild" +VERSION="1.0" +HOMEPAGE="http://www.example.com" +DOWNLOAD="http://www.pastemobile.org/perf.dummy" +MD5SUM="9cba6c70fb57a22a155073d54748b614" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Andreas Guldstrand" +EMAIL="doesnt@matter.org" diff --git a/t/LO/failingslackbuild/README b/t/LO/failingslackbuild/README deleted file mode 100644 index 6d388bb..0000000 --- a/t/LO/failingslackbuild/README +++ /dev/null @@ -1 +0,0 @@ -This doesn't exist! diff --git a/t/LO/failingslackbuild/failingslackbuild.SlackBuild b/t/LO/failingslackbuild/failingslackbuild.SlackBuild deleted file mode 100644 index 626bced..0000000 --- a/t/LO/failingslackbuild/failingslackbuild.SlackBuild +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -PRGNAM="failingslackbuild" -VERSION=${VERSION:-1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -TMP=${TMP:-/tmp/SBo} -OUTPUT=${OUTPUT:-/tmp} - -mkdir -p $TMP/$PRGNAM-$VERSION -cp README $TMP/$PRGNAM-$VERSION -mkdir -p $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION -cp README $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION -cd $OUTPUT/package-$PRGNAM - -exit 1 diff --git a/t/LO/failingslackbuild/failingslackbuild.info b/t/LO/failingslackbuild/failingslackbuild.info deleted file mode 100644 index 5d1991a..0000000 --- a/t/LO/failingslackbuild/failingslackbuild.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="failingslackbuild" -VERSION="1.0" -HOMEPAGE="http://www.example.com" -DOWNLOAD="http://www.pastemobile.org/perf.dummy" -MD5SUM="9cba6c70fb57a22a155073d54748b614" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andreas Guldstrand" -EMAIL="doesnt@matter.org" diff --git a/t/fail.t b/t/fail.t new file mode 100755 index 0000000..e741350 --- /dev/null +++ b/t/fail.t @@ -0,0 +1,66 @@ +#!/usr/bin/env perl + +use 5.16.0; +use strict; +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 ($ENV{TEST_INSTALL}) { + plan tests => 1; +} else { + plan skip_all => 'Only run these tests if TEST_INSTALL=1'; +} +$ENV{TEST_ONLINE} //= 0; + +$path = "$RealBin/../"; + +sub cleanup { + capture_merged { + unlink "$RealBin/LO-fail/failingslackbuild/perf.dummy"; + system(qw!rm -rf /tmp/SBo/failingslackbuild-1.0!); + system(qw!rm -rf /tmp/package-failingslackbuild!); + }; +} + +sub make_slackbuilds_txt { + state $made = 0; + my $fname = "/usr/sbo/repo/SLACKBUILDS.TXT"; + if ($_[0]) { + if ($made) { return system(qw!rm -rf!, $fname); } + } else { + if (not -e $fname) { $made = 1; system('mkdir', '-p', '/usr/sbo/repo'); system('touch', $fname); } + } +} + +sub set_lo { + state $set = 0; + state $lo; + if ($_[0]) { + if ($set) { script (qw/ sboconfig -o /, $lo, { test => 0 }); } + } else { + ($lo) = script (qw/ sboconfig -l /, { expected => qr/LOCAL_OVERRIDES=(.*)/, test => 0 }); + $lo //= 'FALSE'; + note "Saving original value of LOCAL_OVERRIDES: $lo"; + $set = 1; + script (qw/ sboconfig -o /, "$RealBin/LO-fail", { test => 0 }); + } +} + +cleanup(); +make_slackbuilds_txt(); +set_lo(); + +# 1: Failing slackbuild script +script (qw/ sboinstall failingslackbuild /, { input => "y\ny", expected => qr/Failures:\n failingslackbuild: failingslackbuild.SlackBuild return non-zero\n\z/, exit => 3 }); + +# Cleanup +END { + set_lo('delete'); + make_slackbuilds_txt('delete'); + cleanup(); +} diff --git a/t/install.t b/t/install.t index 33753e4..db1c87a 100755 --- a/t/install.t +++ b/t/install.t @@ -11,7 +11,7 @@ use lib "$RealBin/../SBO-Lib/lib"; use Test::Execute; if ($ENV{TEST_INSTALL}) { - plan tests => 9; + plan tests => 8; } else { plan skip_all => 'Only run these tests if TEST_INSTALL=1'; } @@ -95,9 +95,6 @@ script (qw/ sboremove nonexistentslackbuild5 /, { input => "y\ny", test => 0 }); script (qw/ sboinstall nonexistentslackbuild4 /, { input => "y\ny", expected => qr/nonexistentslackbuild5 added to install queue.*Install queue: nonexistentslackbuild5/s }); script (qw/ sboremove nonexistentslackbuild4 nonexistentslackbuild5 /, { input => "y\ny\ny", test => 0 }); -# 9: sboinstall failingslackbuild -script (qw/ sboinstall failingslackbuild /, { input => "y\ny", expected => qr/Failures:\n failingslackbuild: failingslackbuild.SlackBuild return non-zero\n\z/, exit => 3 }); - # Cleanup END { set_lo('delete'); -- cgit v1.2.3