summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2013-05-24 11:52:23 -0400
committerNalin Dahyabhai <nalin@redhat.com>2013-05-24 11:52:39 -0400
commit8d847e66539bd2a6cc5b26f069b12b0e6ddb2003 (patch)
tree980a5fe3a2cb21c584ec6007f5c47bb2dbd9fbbe /tests
parentfd975c77fda8dc2485eede3c15aee3fc3d236a9f (diff)
downloadslapi-nis-8d847e66539bd2a6cc5b26f069b12b0e6ddb2003.tar.gz
slapi-nis-8d847e66539bd2a6cc5b26f069b12b0e6ddb2003.tar.xz
slapi-nis-8d847e66539bd2a6cc5b26f069b12b0e6ddb2003.zip
Factor out the sleeping
Diffstat (limited to 'tests')
-rwxr-xr-xtests/run-tests.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 91afdc9..aba19a8 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -18,6 +18,10 @@ showdiff()
diff -u "$@" | \
sed -r -e "s,^--- .*/(.*),--- \1,g" -e "s,^\+\+\+ .*/(.*),+++ \1,g"
}
+settle()
+{
+ sleep 5
+}
for subdir in "$@" ; do
pushd $subdir > /dev/null
TEST="$subdir"
@@ -51,7 +55,7 @@ for subdir in "$@" ; do
fi
startslapd $TESTDIR/$subdir/dse.ldif $TESTDIR/$subdir/userRoot.ldif "$precmd"
if test -x $TESTDIR/$subdir/before.sh ; then
- sleep 5
+ settle
$TESTDIR/$subdir/before.sh > before.out 2>&1
if test -r $TESTDIR/$subdir/before.txt ; then
if ! compare $TESTDIR/$subdir/before.txt before.out ; then
@@ -63,6 +67,7 @@ for subdir in "$@" ; do
fi
fi
if test -x $TESTDIR/$subdir/change.sh ; then
+ settle
$TESTDIR/$subdir/change.sh > change.out 2>&1
if test -r $TESTDIR/$subdir/change.txt ; then
if ! compare $TESTDIR/$subdir/change.txt change.out ; then
@@ -74,7 +79,7 @@ for subdir in "$@" ; do
fi
fi
if test -x $TESTDIR/$subdir/after.sh ; then
- sleep 5
+ settle
$TESTDIR/$subdir/after.sh > after.out 2>&1
if test -r $TESTDIR/$subdir/after.txt ; then
if ! compare $TESTDIR/$subdir/after.txt after.out ; then