diff options
| author | Andreas Guldstrand <andreas.guldstrand@gmail.com> | 2019-04-27 13:30:13 +0200 |
|---|---|---|
| committer | Andreas Guldstrand <andreas.guldstrand@gmail.com> | 2019-04-27 14:42:36 +0200 |
| commit | dc2911fc741e36311db8134a2adedb56802f1aa5 (patch) | |
| tree | 777af638f82c6466397525d2b82690032f306ead /t | |
| parent | 389d715aecb0f647aef813d1fc9f201d1b47b9ed (diff) | |
| download | sbotools2-dc2911fc741e36311db8134a2adedb56802f1aa5.tar.xz | |
sboinstall, Build, Info: Allow ignoring of SBo from reqs that doesn't exist
Diffstat (limited to 't')
| -rwxr-xr-x | t/04-install.t | 2 | ||||
| -rwxr-xr-x | t/05-upgrade.t | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/t/04-install.t b/t/04-install.t index f1f922f..b318d60 100755 --- a/t/04-install.t +++ b/t/04-install.t @@ -50,7 +50,7 @@ ok (-e "/usr/sbo/repo/SLACKBUILDS.TXT", "SLACKBUILDS.TXT has been migrated back sboremove 'nonexistentslackbuild', { input => "y\ny", test => 0 }; # 4: sboinstall nonexistentslackbuild2 -sboinstall 'nonexistentslackbuild2', { exit => 1, expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\n" }; +sboinstall 'nonexistentslackbuild2', { exit => 0, expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\nDo you want to ignore it and continue? [n] ", input => "n" }; # 5: sboinstall nonexistentslackbuild3 sboinstall 'nonexistentslackbuild3', { exit => 1, expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\n" }; diff --git a/t/05-upgrade.t b/t/05-upgrade.t index 44037c6..1d7d541 100755 --- a/t/05-upgrade.t +++ b/t/05-upgrade.t @@ -11,7 +11,7 @@ use Test::Sbotools qw/ make_slackbuilds_txt set_lo sboconfig sboinstall sboupgra use File::Temp 'tempdir'; if ($ENV{TEST_INSTALL}) { - plan tests => 21; + plan tests => 22; } else { plan skip_all => 'Only run these tests if TEST_INSTALL=1'; } @@ -149,6 +149,10 @@ sboupgrade qw/ -r nonexistentslackbuild /, { expected => "" }; install('LO2', 'nonexistentslackbuild', 'nonexistentslackbuild5'); sboupgrade qw/nonexistentslackbuild nonexistentslackbuild5/, { input => "foo\n\nn\nn\n", expected => qr/Proceed with nonexistentslackbuild\?.*Proceed with nonexistentslackbuild\?.*Proceed with nonexistentslackbuild5\?.*Upgrade queue: nonexistentslackbuild$/sm }; +# 22: sboupgrade on something installed with no-longer-existing dep +install('LO', 'nonexistentslackbuild2'); +sboupgrade qw/ -f -z nonexistentslackbuild2 /, { input => "n", expected => "Unable to locate nonexistentslackbuild3 in the SlackBuilds.org tree.\nDo you want to ignore it and continue? [n] " }; + # Cleanup END { cleanup(); |