tests: Move assert_fail function to tests/libtest.sh
authorRobert Fairley <rfairley@redhat.com>
Thu, 5 Jul 2018 16:30:05 +0000 (12:30 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 5 Jul 2018 17:59:09 +0000 (17:59 +0000)
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

tests/libtest.sh
tests/test-remote-headers.sh

index 388408df7150338d92cd00e92b13d19b9f740933..f09f4a2c5270d8607ffa5fc26a2365cc2823f0d2 100755 (executable)
@@ -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
+}
index a4ee386f1b7a856add3eb1475c4d30a9339f5ceb..a41d087a46c5a34b7dc7f8600f684804f907b85e 100755 (executable)
@@ -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