Exit code now passed to expectation handlers
parent
3d1f9d22a7
commit
6dbf996f3b
|
@ -23,6 +23,6 @@
|
|||
__INC_EXPECT_CORE=1
|
||||
|
||||
|
||||
_expect--succeed() { test "$(_spec-last-exit)" -eq 0; }
|
||||
_expect--fail() { test "$(_spec-last-exit)" -ne 0; }
|
||||
_expect--succeed() { test "$1" -eq 0; }
|
||||
_expect--fail() { test "$1" -ne 0; }
|
||||
|
||||
|
|
11
src/spec
11
src/spec
|
@ -167,8 +167,7 @@ to()
|
|||
type "$assert" &>/dev/null \
|
||||
|| _bail "unknown expectation: \`$type'" $__spec_caller
|
||||
|
||||
# invoke partially-applied assertion with remaining arguments
|
||||
$assert "$@" || fail "$expect_full"
|
||||
$assert "$__spec_rexit" "$@" || fail "$expect_full"
|
||||
__spec_caller=
|
||||
}
|
||||
|
||||
|
@ -214,11 +213,3 @@ _bail()
|
|||
exit 1
|
||||
}
|
||||
|
||||
|
||||
##
|
||||
# Retrieve the exit code of the most recently executed command
|
||||
_spec-last-exit()
|
||||
{
|
||||
echo "$__spec_rexit"
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,47 @@
|
|||
#!/bin/bash
|
||||
# Core expectation tests
|
||||
#
|
||||
# Copyright (C) 2014 Mike Gewitz
|
||||
#
|
||||
# This file is part of shspec.
|
||||
#
|
||||
# shspec is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
|
||||
|
||||
describe succeed
|
||||
it will succeed when command exits with status code 0
|
||||
expect _expect--succeed 0
|
||||
to succeed
|
||||
end
|
||||
|
||||
it will fail when command exits with non-zero status code
|
||||
expect _expect--succeed 1
|
||||
to fail
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
describe fail
|
||||
it will succeed when command exits with non-zero status code
|
||||
expect _expect--fail 1
|
||||
to succeed
|
||||
end
|
||||
|
||||
it will fail when command exits with status code 0
|
||||
expect _expect--fail 0
|
||||
to fail
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue