[gentoo-commits] proj/portage-utils:master commit in: tests/qmerge/, tests/

[Mike Frysinger]

commit:     7c3dd0d6df1e356efd44f6390e3a04c248093e33
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 08:58:32 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 08:58:32 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=7c3dd0d6

tests: add a treedir helper to get better failure output

---
 tests/init.sh       | 7 +++++++
 tests/qmerge/dotest | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/init.sh b/tests/init.sh
index 8fafdd7..e2c3562 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -85,3 +85,10 @@ _cleantmpdir() {
 }
 cleantmpdir() { _cleantmpdir "rm -rf" "$@" ; }
 trimtmpdir() { _cleantmpdir "rmdir" "$@" ; }
+
+treedir() {
+       local d=$1
+       if ! tree "${d}" 2>/dev/null ; then
+               ls -R "${d}"
+       fi
+}

diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index 47a9e28..9c4bcb4 100755
--- a/tests/qmerge/dotest
+++ b/tests/qmerge/dotest
@@ -37,7 +37,7 @@ tend $? "qmerge-test: [N] vdb installed"
 [[ -x ${ROOT}/usr/bin/qmerge-test && \
    -f ${ROOT}/etc/some.conf && \
    -f ${ROOT}/etc/another.conf ]]
-tend $? "qmerge-test: [N] installed expected files" || ls -R ${ROOT}
+tend $? "qmerge-test: [N] installed expected files" || treedir "${ROOT}"
 
 # Now do a re-emerge.
 
@@ -45,7 +45,7 @@ out=$(yes | qmerge -F qmerge-test)
 tend $? "qmerge-test: [R] re-emerge" || echo "${out}"
 
 [[ -x ${ROOT}/usr/bin/qmerge-test ]]
-tend $? "qmerge-test: [R] installed expected files" || ls -R ${ROOT}
+tend $? "qmerge-test: [R] installed expected files" || treedir "${ROOT}"
 
 order=$(echo "${out}" | awk '$1 == ">>>" { printf "%s ", $NF }')
 [[ ${order} == "pkg_pretend pkg_setup pkg_preinst pkg_postinst pkg_prerm 
pkg_postrm " ]]
@@ -55,7 +55,7 @@ tend $? "qmerge-test: [R] pkg_* order of execution" || printf 
'%s\n' "${order}"
    -f ${ROOT}/etc/some.conf && \
    -f ${ROOT}/etc/another.conf && \
    -f ${ROOT}/etc/._cfg0000_some.conf ]]
-tend $? "qmerge-test: [R] re-installed expected files" || ls -R ${ROOT}
+tend $? "qmerge-test: [R] re-installed expected files" || treedir "${ROOT}"
 
 # Finally do an unmerge.
 
@@ -73,7 +73,7 @@ tend $? "qmerge-test: [C] pkg_* order of execution" || printf 
'%s\n' "${order}"
      -f ${ROOT}/etc/some.conf && \
    ! -f ${ROOT}/etc/another.conf && \
    ! -d ${ROOT}/var ]]
-tend $? "qmerge-test: [C] uninstalled expected files" || ls -R ${ROOT}
+tend $? "qmerge-test: [C] uninstalled expected files" || treedir "${ROOT}"
 
 set -e