From 6a6a04123cc06ef8abd21549998e0d186d5b3934 Mon Sep 17 00:00:00 2001 From: Andreas Guldstrand Date: Sun, 14 Feb 2016 15:47:29 +0100 Subject: Change what we expect as output from 2 tests that failed under travis --- t/12-readme.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/12-readme.t b/t/12-readme.t index 3595487..7db99a3 100755 --- a/t/12-readme.t +++ b/t/12-readme.t @@ -67,14 +67,14 @@ script (qw/ sboinstall envsettingtest /, { input => "n\ny\ny", exit => 3, expect script (qw/ sboinstall envsettingtest /, { input => "y\nFOO=foo\ny\ny", exit => 3, expected => qr{Please supply any options here, or enter to skip:.*FOO isn't bar!.*envsettingtest: envsettingtest.SlackBuild return non-zero}s }); # 3: sboinstall envsettingtest - success -script (qw/ sboinstall envsettingtest /, { input => "y\nFOO=bar\ny\ny", expected => qr{Please supply any options here, or enter to skip:.*Install queue: envsettingtest.*Package envsettingtest-1[.]0-noarch-1_SBo[.]tgz installed[.]}s }); +script (qw/ sboinstall envsettingtest /, { input => "y\nFOO=bar\ny\ny", expected => qr{Please supply any options here, or enter to skip:.*Install queue: envsettingtest.*Cleaning for envsettingtest-1[.]0}s }); script (qw/ sboremove envsettingtest /, { input => "y\ny", test => 0 }); # 4: sboinstall envsettingtest2 - fail prereq script (qw/ sboinstall envsettingtest2 /, { input => "n\ny\ny\nFOO=quux\ny\ny\nn", exit => 3, expected => qr{It looks like envsettingtest has options.*Proceed with envsettingtest.*It looks like envsettingtest2 has options.*Please supply any options here.*Install queue: envsettingtest envsettingtest2.*FOO isn't bar!.*envsettingtest: envsettingtest.SlackBuild return non-zero}s }); # 5: sboinstall envsettingtest2 - success -script (qw/ sboinstall envsettingtest2 /, { input => "y\nFOO=bar\ny\ny\nFOO=quux\ny\ny", expected => qr{It looks like envsettingtest has options.*Please supply any options here.*It looks like envsettingtest2 has options.*Please supply any options here.*Install queue: envsettingtest envsettingtest2.*Package envsettingtest2-1[.]0-noarch-1_SBo[.]tgz installed[.]}s }); +script (qw/ sboinstall envsettingtest2 /, { input => "y\nFOO=bar\ny\ny\nFOO=quux\ny\ny", expected => qr{It looks like envsettingtest has options.*Please supply any options here.*It looks like envsettingtest2 has options.*Please supply any options here.*Install queue: envsettingtest envsettingtest2.*Cleaning for envsettingtest2-1[.]0}s }); script (qw/ sboremove envsettingtest2 /, { input => "y\ny\ny", test => 0 }); # Cleanup -- cgit v1.2.3