diff --git a/tests-ng/import.sh b/tests-ng/import.sh index b9fd81b..c71972a 100755 --- a/tests-ng/import.sh +++ b/tests-ng/import.sh @@ -114,10 +114,10 @@ cd ${ddpath} | ${bin} install -f -c ${cfg} -p p1 -V [ ! -e ${tmpd}/def ] && exit 1 [ ! -e ${tmpd}/xyz ] && exit 1 [ ! -e ${tmpd}/dyn ] && exit 1 -grep 'abc' ${tmpd}/abc -grep 'def' ${tmpd}/def -grep 'xyz' ${tmpd}/xyz -grep 'dyn' ${tmpd}/dyn +grep 'abc' ${tmpd}/abc >/dev/null 2>&1 +grep 'def' ${tmpd}/def >/dev/null 2>&1 +grep 'xyz' ${tmpd}/xyz >/dev/null 2>&1 +grep 'dyn' ${tmpd}/dyn >/dev/null 2>&1 ## CLEANING rm -rf ${tmps} ${tmpd} diff --git a/tests/helpers.py b/tests/helpers.py index 13b712d..ff65799 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -14,7 +14,7 @@ from dotdrop.options import Options from dotdrop.linktypes import LinkTypes from dotdrop.utils import strip_home -TMPSUFFIX = '.dotdrop' +TMPSUFFIX = '-dotdrop-tests' def clean(path): @@ -33,12 +33,12 @@ def get_string(length): """Get a random string of length 'length'""" alpha = string.ascii_uppercase + string.digits temp = ''.join(random.choice(alpha) for _ in range(length)) - return 'dotdrop-tests-{}'.format(temp) + return 'tmp.{}{}'.format(temp, TMPSUFFIX) def get_tempdir(): """Get a temporary directory""" - return tempfile.mkdtemp(prefix='dotdrop-tests-') + return tempfile.mkdtemp(suffix=TMPSUFFIX) def create_random_file(directory, content=None,