summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2018-03-22 12:45:51 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-22 19:01:52 +0000
commitd2c7c550c156fbc4d1a8e7edbfd91166c44e6fca (patch)
tree8e0b17689cd244f8681ff283f4909a0dc478c938
parentbb9cd1eb7213180ceaa1c913b9565f97e08331cc (diff)
downloadostree-d2c7c550c156fbc4d1a8e7edbfd91166c44e6fca.tar.gz
tests: Small tweaks for local iteration
Support e.g. `-e tests=payload-link`, to choose specific tests for more rapid iteration, and allow skipping tmpdir cleanup to be able to debug. Closes: #1509 Approved by: jlebon
-rw-r--r--tests/fedora-str/sysinstall-tests.yml3
-rw-r--r--tests/installed/libinsttest.sh3
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/fedora-str/sysinstall-tests.yml b/tests/fedora-str/sysinstall-tests.yml
index 88b289d4..58f216ae 100644
--- a/tests/fedora-str/sysinstall-tests.yml
+++ b/tests/fedora-str/sysinstall-tests.yml
@@ -6,6 +6,7 @@
remote_user: root
vars:
use_git_build: True
+ tests: ""
tasks:
- import_tasks: overlay-git.yml
when: use_git_build
@@ -15,6 +16,8 @@
# Down the line perhaps do each log file separately?
- name: Run shell script sysinstalled tests
shell: /root/tests/installed/run.sh &> /root/installed-tests.log
+ environment:
+ TESTS: "{{ tests }}"
register: sysinstalled_result
failed_when: False
- name: Fetch sysinstalled results
diff --git a/tests/installed/libinsttest.sh b/tests/installed/libinsttest.sh
index 6d6ba50c..96da9545 100644
--- a/tests/installed/libinsttest.sh
+++ b/tests/installed/libinsttest.sh
@@ -25,7 +25,8 @@ dn=$(dirname $0)
# Copy of bits from tap-test
test_tmpdir=
function _tmpdir_cleanup () {
- if test -n "${test_tmpdir}" && test -f ${test_tmpdir}/.testtmp; then
+ if test -z "${TEST_SKIP_CLEANUP:-}" &&
+ test -n "${test_tmpdir}" && test -f ${test_tmpdir}/.testtmp; then
rm "${test_tmpdir}" -rf
fi
}