From 058cdf4a21f445f0a140f8b8e78828b5983e2a98 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 6 Oct 2022 15:31:44 +0100 Subject: [PATCH] ITS#9926 drop symlinks from homedir testdata Create them when running the test script instead. --- tests/data/homedir/skel/directory/broken link | 1 - tests/data/homedir/skel/symlink | 1 - tests/data/slapd-homedir.conf | 2 +- tests/scripts/test085-homedir | 4 ++++ 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 120000 tests/data/homedir/skel/directory/broken link delete mode 120000 tests/data/homedir/skel/symlink diff --git a/tests/data/homedir/skel/directory/broken link b/tests/data/homedir/skel/directory/broken link deleted file mode 120000 index 78bc33729b..0000000000 --- a/tests/data/homedir/skel/directory/broken link +++ /dev/null @@ -1 +0,0 @@ -../target \ No newline at end of file diff --git a/tests/data/homedir/skel/symlink b/tests/data/homedir/skel/symlink deleted file mode 120000 index 6d0450cc24..0000000000 --- a/tests/data/homedir/skel/symlink +++ /dev/null @@ -1 +0,0 @@ -directory \ No newline at end of file diff --git a/tests/data/slapd-homedir.conf b/tests/data/slapd-homedir.conf index 4d1e738ef7..95f1ecc5f8 100644 --- a/tests/data/slapd-homedir.conf +++ b/tests/data/slapd-homedir.conf @@ -46,7 +46,7 @@ rootpw secret overlay homedir homedir-min-uidnumber @MINUID@ -homedir-skeleton-path @DATADIR@/homedir/skel +homedir-skeleton-path @TESTDIR@/skel homedir-regexp ^(/home/[-_/a-z0-9]+)$ @TESTDIR@/$1 homedir-delete-style ARCHIVE homedir-archive-path @TESTDIR@/archive diff --git a/tests/scripts/test085-homedir b/tests/scripts/test085-homedir index 8685b91669..5c9ce2466f 100755 --- a/tests/scripts/test085-homedir +++ b/tests/scripts/test085-homedir @@ -23,6 +23,10 @@ fi mkdir -p $TESTDIR $DBDIR1 $TESTDIR/home $TESTDIR/archive +# copy skel dir so we can create symlinks in it +cp -r $DATADIR/homedir/skel $TESTDIR +(cd $TESTDIR/skel; ln -s directory symlink; cd directory; ln -s ../target "broken link") + $SLAPPASSWD -g -n >$CONFIGPWF echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf -- 2.47.2