X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=packaging%2Fcommon%2Fmock_utils.sh;fp=packaging%2Fcommon%2Fmock_utils.sh;h=1db24f86f3869e9b8db287f4ccfbf6c176100275;hb=949b8910a5e23c4285d0b1aedacfc82a14dc97a5;hp=a0989c2bc79c1f08ee6c54ba9fd5bf8f4fe2fb8c;hpb=c6f0a88c567f8536c498f554285aed1f8150da18;p=debian%2Famanda

diff --git a/packaging/common/mock_utils.sh b/packaging/common/mock_utils.sh
index a0989c2..1db24f8 100644
--- a/packaging/common/mock_utils.sh
+++ b/packaging/common/mock_utils.sh
@@ -11,6 +11,8 @@
 MOCKDIR=$TMPDIR/mocks; export MOCKDIR
 [ -d $MOCKDIR ] || mkdir $MOCKDIR
 PATH=${MOCKDIR}:$PATH; export PATH
+# A list of flag files that must be present to avoid spurious output.
+# Each mock util gets one whether it is used or not.
 mock_flag_files=""
 
 mk_mock_util() {
@@ -61,24 +63,88 @@ EOF
 ###############
 # id replacemnt
 
-# Set defaults for deb_uid and amanda_group, if running outside test_sh_libs
+# Set vars for output of -Gn
+id_0="biff"
+id_1="biff foo"
+id_2="biff bar baz"
+id_3="biff zip bop whir"
+
+# Set defaults for uid and amanda_group, if running outside test_sh_libs
 deb_uid=${deb_uid:=12345}
 amanda_group=${amanda_group:=disk}
 
 mk_mock_util "id"
 cat << EOF >> "${MOCKDIR}/id"
-echo "id args: \${1}" > $mock_id_flags
+echo "id args: \${@}" > $mock_id_flags
 [ -n "\${1}" ] || { echo "Missing a username to id!"; exit 1; }
 
-# We have to return the most basic form of id to be portable
-# group file is used for supplemental groups.
-if [ -f "${MOCKDIR}/is_member" ]; then
-    echo "uid=${deb_uid}(\${1}) gid=6(${amanda_group})"
+# We can only use id with no flags to have consistent results.  Solaris
+# /usr/bin/id does not provide any standard flags. Since /usr/xpg4/bin is
+# not part of a minimal install we can't depend on it. Any flags *at all*
+# should raise an error in the tests.
+# group file and /usr/bin/groups can be used (with some tweaks).
+for f in "\$@"; do
+    case \$f in
+        # -- is ok, surprisingly.
+        --) : ;;
+        -?*) echo "id: no options are portable! '\$f'"
+             # Solaris exits with 2, others with 1. ugh.
+             exit 2
+        ;;
+        *) : ;;
+    esac
+done
+
+# Use id_group to control primary group name.
+[ -f ${MOCKDIR}/id_group ] && group=\`cat ${MOCKDIR}/id_group\` || group=bar
+
+# Solaris, Linux and OSX differ in the exact format of the output from id,
+# so we provide sample output based on the contents of id_os.  We don't
+# parse it, but its presence can't break things.
+test_os=\`cat ${MOCKDIR}/id_os\`
+case \${test_os} in
+    linux) sup_groups=" groups=999(\${group}),1000(foo)" ;;
+    solaris) sup_groups="" ;;
+    osx) sup_groups=" groups=999(\${group}), 1000(foo)" ;;
+esac
+
+if [ -f ${MOCKDIR}/id_exists ]; then
+    # Note: uid is set when the mock is created.
+    echo "uid=${deb_uid}(\${1}) gid=6(\${group})\${sup_groups}"
 else
-    echo "uid=123(\${1}) gid=123(foobar)"
+    echo "id: \${1}: no such user" >&2
+    exit 1
 fi
 EOF
 
+###############
+# groupadd replacement
+mk_mock_util "groupadd"
+cat << EOF >> "${MOCKDIR}/groupadd"
+echo "groupadd args: \${@}" > $mock_groupadd_flags
+# We check for return codes of 0 (group added) or 9 (group existed) to
+# continue in the function that uses groupadd
+groupadd_rc=\`cat ${MOCKDIR}/groupadd_rc\`
+exit \${groupadd_rc}
+EOF
+
+###############
+# groups replacement
+mk_mock_util "groups"
+cat << EOF >> "${MOCKDIR}/groups"
+echo "groups args: \${@}" > $mock_groups_flags
+cat ${MOCKDIR}/groups_output
+EOF
+
+###############
+# usermod replacement
+mk_mock_util "usermod"
+cat << EOF >> "${MOCKDIR}/usermod"
+echo "usermod args: \${@}" > $mock_usermod_flags
+# Protect against passing a blank username.
+[ "x\${1}" = "x" ] && exit 2 || exit 0
+EOF
+
 ###############
 # svcs replacement
 mk_mock_util "svcs"
@@ -96,7 +162,7 @@ EOF
 # xinetd init script replacement
 mk_mock_util xinetd
 cat << EOF >> "${MOCKDIR}/xinetd"
-echo "xinetd args: \${1}" > $mock_xinetd_flags
+echo "xinetd args: \${@}" > $mock_xinetd_flags
 [ -f ${MOCKDIR}/success ] && exit 0
 echo "xinetd did not \${1}"
 exit 1
@@ -106,7 +172,7 @@ EOF
 # inetd init script replacement
 mk_mock_util inetd
 cat << EOF >> "${MOCKDIR}/inetd"
-echo "inetd args: \${1}" > $mock_inetd_flags
+echo "inetd args: \${@}" > $mock_inetd_flags
 [ -f ${MOCKDIR}/success ] && exit 0
 echo "inetd did not \${1}"
 exit 1
@@ -116,7 +182,7 @@ EOF
 # install replacement
 mk_mock_util install
 cat << EOF >> "${MOCKDIR}/install"
-echo "install args: \$@" > $mock_install_flags
+echo "install args: \${@}" > $mock_install_flags
 [ -f ${MOCKDIR}/success ] && exit 0
 echo "Some funky install error, yo!"
 exit 1