diff options
author | Robert Fairley <rfairley@redhat.com> | 2018-07-05 12:30:05 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-05 17:59:09 +0000 |
commit | 4f096c8f11c06883c5eec03c0ad6d962f3d82a4d (patch) | |
tree | 539c8fa075b45cb30522f5438bdf26b56a2953e2 | |
parent | 3696e1cfdd1f0109c7cd9e157763ecef23ae7adc (diff) | |
download | ostree-4f096c8f11c06883c5eec03c0ad6d962f3d82a4d.tar.gz |
tests: Move assert_fail function to tests/libtest.sh
This moves the assert_fail function definition which was defined
and called in tests/test-remote-headers.sh. Done in preparation
for use of the assert_fail function in other test files.
Closes: #1669
Approved by: jlebon
-rwxr-xr-x | tests/libtest.sh | 9 | ||||
-rwxr-xr-x | tests/test-remote-headers.sh | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/libtest.sh b/tests/libtest.sh index 388408df..f09f4a2c 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -648,3 +648,12 @@ assert_not_ref () { fatal "rev-parse $2 unexpectedly succeeded!" fi } + +assert_fail () { + set +e + $@ + if [ $? = 0 ] ; then + echo 1>&2 "$@ did not fail"; exit 1 + fi + set -euo pipefail +} diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh index a4ee386f..a41d087a 100755 --- a/tests/test-remote-headers.sh +++ b/tests/test-remote-headers.sh @@ -33,15 +33,6 @@ setup_fake_remote_repo1 "archive" "" \ --expected-header baz=badger \ --expected-header "User-Agent=libostree/$V dodo/2.15" -assert_fail (){ - set +e - $@ - if [ $? = 0 ] ; then - echo 1>&2 "$@ did not fail"; exit 1 - fi - set -euo pipefail -} - cd ${test_tmpdir} rm repo -rf mkdir repo |