Merge ~ahasenack/ubuntu/+source/autofs:cosmic-autofs-dep8-1677751 into ubuntu/+source/autofs:ubuntu/devel

[Andreas Hasenack]

Given the recent surprises I had with autofs not working and segfaulting, I thought it's time to add some dep8 tests.

This branch adds tests for samba (authenticated and anonymous) and nfs. You can check the branch out and run with autopkgtest. I run like this:
autopkgtest -o ../dep8-output -U -s --apt-pocket=proposed ./ -- qemu /var/lib/adt-images/autopkgtest-cosmic-amd64.img

The full run takes about 10min.

[Christian Ehrhardt  (paelzer)]

First of all - I totally like it.
Thanks for holding up the spirit of bugfixing and improvement in these busy times!

Some comments inline already - I'm still testing the code ...

[Christian Ehrhardt  (paelzer)]

Tests all look good and succeed.

+1 from a Reviews POV.

Now that Bileto is working again I'd recommend to test it there to get full LP+Arch coverage before an upload.

review: Approve

356af40... by Andreas Hasenack on 2018-06-13

Be a bit more generous with timeouts

[Andreas Hasenack (ahasenack)]

This is blocked in bileto now: https://bileto.ubuntu.com/#/ticket/3293

[Christian Ehrhardt  (paelzer)]

>
> > + if ! testparm -s 2>&1 | grep -qE "^\[${share}\]"; then
> > + echo "Adding [${share}] share"
> > + cat >> /etc/samba/smb.conf <<EOFEOF
> > +[${share}]
>
> Indentation isn't important, it's just aesthetic. What do you mean by
> inline, just a bunch of echo's instead of cat? Or both [${share}] and the
> lines below it in column 1?
>

All moved from column 1 to the column of "cat"+4
But this is style/opinion-only, so only follow if you prefer that as well.
Keep it as-is otherwise please

[Christian Ehrhardt  (paelzer)]

FYI: I kicked the tests in the ticket, if it works (as it did two weeks ago) we should later on have results

[Christian Ehrhardt  (paelzer)]

Tests are good:
https://bileto.ubuntu.com/excuses/3293/cosmic.html

[Christian Ehrhardt  (paelzer)]

Check the ouput of all tests on all arches, and if you are ok please go on with the upload.
Since we know it is good now you can also suggest to Debian to help them as well.

[Andreas Hasenack (ahasenack)]

The armhf tests were skipped because there is no vm for it:

smb-mount SKIP Test requires machine-level isolation but testbed does not provide that
nfs-mount SKIP Test requires machine-level isolation but testbed does not provide that

Is it expected to have no vm for armhf? What's the alternative?

[Andreas Hasenack (ahasenack)]

Looks like that's the way it is on armh :)

Please tag and upload, thanks

diff --git a/debian/changelog b/debian/changelog
index 5efc4bf..db1546d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+autofs (5.1.2-3ubuntu2) cosmic; urgency=medium
+
+  * Add DEP8 tests (LP: #1677751):
+    - d/tests/control, d/tests/smb-mount: smb automount DEP8 test
+    - d/tests/control, d/tests/nfs-mount: nfs automount DEP8 test
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 12 Jun 2018 17:35:31 -0300
+
 autofs (5.1.2-3ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian unstable (LP: #1775232). Remaining changes:
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..0058590
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,7 @@
+Tests: smb-mount
+Depends: @, cifs-utils, samba, smbclient
+Restrictions: isolation-machine, needs-root, allow-stderr
+
+Tests: nfs-mount
+Depends: @, nfs-common, nfs-server
+Restrictions: isolation-machine, needs-root, allow-stderr
diff --git a/debian/tests/nfs-mount b/debian/tests/nfs-mount
new file mode 100644
index 0000000..f3ed7c1
--- /dev/null
+++ b/debian/tests/nfs-mount
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -x
+set -e
+
+now=$(date --utc)
+result=0
+
+echo "creating /nfspub nfs export"
+mkdir -p /nfspub
+echo "${now} - This is an nfs public export" > /nfspub/nfs-public.txt
+echo "/nfspub *(ro,no_subtree_check)" > /etc/exports
+exportfs -avr
+
+echo "Configuring automount for nfs on /net"
+mkdir -p /etc/auto.master.d
+echo '/net -hosts -intr,soft --timeout=180' > /etc/auto.master.d/net.autofs
+systemctl restart autofs
+
+echo "Accessing the autofs mountpoint"
+timeout 30s grep -qE "${now}.*nfs public" /net/localhost/nfspub/nfs-public.txt || result=$?
+if [ "$result" -ne "0" ]; then
+    echo "test failed, couldn't access /net/localhost/nfspub/nfs-public.txt"
+    exit ${result}
+fi
diff --git a/debian/tests/smb-mount b/debian/tests/smb-mount
new file mode 100644
index 0000000..b9b685b
--- /dev/null
+++ b/debian/tests/smb-mount
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+set -x
+
+add_smb_share() {
+    local share="$1"
+    local sharepath="$2"
+    local public="$3"
+
+    if ! testparm -s 2>&1 | grep -qE "^\[${share}\]"; then
+        echo "Adding [${share}] share"
+        cat >> /etc/samba/smb.conf <<EOFEOF
+[${share}]
+  path = ${sharepath}
+  read only = no
+EOFEOF
+    if [ "${public}" = "yes" ]; then
+        cat >> /etc/samba/smb.conf <<EOFEOF
+  guest ok = yes
+EOFEOF
+    else
+        cat >> /etc/samba/smb.conf <<EOFEOF
+  guest ok = no
+EOFEOF
+    fi
+        systemctl reload smbd.service
+    else
+        echo "No need to add private [${share}] share, continuing."
+    fi
+}
+
+create_user() {
+    local username="$1"
+    local password="$2"
+
+    useradd -m "$username"
+    echo "Setting samba password for the ${username} user"
+    echo "${password}\n${password}" | smbpasswd -s -a ${username}
+}
+
+
+now=$(date --utc)
+result=0
+# Remount everything in case someone is running this interactively
+# and mounts from previous runs and previous usernames are still lingering
+systemctl restart autofs
+
+echo "Setting up a public samba share in /pub"
+mkdir -p /pub
+echo "${now} - This is the public samba share." > /pub/hello-public.txt
+add_smb_share pub /pub yes
+
+echo "Setting up a private samba share in /private"
+mkdir -p /private
+echo "${now} - This is the private samba share." > /private/hello-private.txt
+add_smb_share private /private no
+
+username="smbtest$$"
+password="$$"
+echo "Creating a local test user called ${username}"
+create_user "${username}" "${password}"
+
+echo "Setting up autofs credentials for the private share"
+mkdir -m 0700 -p /etc/creds
+cat > /etc/creds/localhost <<EOFEOF
+username=${username}
+password=${password}
+domain=WORKGROUP
+EOFEOF
+chmod 0600 /etc/creds/localhost
+
+if ! grep -qE "^/cifs" /etc/auto.master; then
+    echo "Configuring autofs for the /cifs mountpoint"
+    echo "/cifs /etc/auto.smb --timeout=180" >> /etc/auto.master
+    systemctl restart autofs
+fi
+
+# We use a trick here. By storing the credentials in /etc/creds/localhost,
+# that means the autofs key is "localhost", and the credentials will be used
+# when accessing /cifs/localhost.
+# If instead we access /cifs/127.0.0.1, since there is no corresponding entry in
+# /etc/creds, that access will be as a guest, i.e., with no credentials
+echo "Testing authenticated share automount"
+timeout 30s grep -qE "${now}.*private" /cifs/localhost/private/hello-private.txt || result=$?
+if [ "$result" -ne "0" ]; then
+    echo "test failed"
+    exit ${result}
+fi
+
+echo "Confirming with smbstatus that an authenticated connection was used"
+output=$(smbstatus 2>&1)
+echo "${output}" | grep -q "${username}" || result=$?
+if [ "${result}" -ne "0" ]; then
+    echo "test failed"
+    echo "smbstatus output:"
+    echo "${smbstatus}"
+    exit "${result}"
+fi
+
+echo "Confirming with mount -t cifs that the filesystem is mounted with authentication"
+output=$(mount -t cifs 2>&1)
+echo "${output}" | grep -qE "on /cifs/localhost/private.*username=${username}" || result=$?
+if [ "${result}" -ne "0" ]; then
+    echo "test failed"
+    echo "mount -t cifs output:"
+    echo "${output}"
+    exit ${result}
+fi
+
+echo "Testing unauthenticated share automount"
+timeout 30s grep -q "${now}.*public" /cifs/127.0.0.1/pub/hello-public.txt || result=$?
+if [ "$result" -ne "0" ]; then
+    echo "test failed"
+    exit ${result}
+fi
+
+echo "Confirming with smbstatus that a guest connection was used"
+output=$(smbstatus 2>&1)
+echo "${output}" | grep -q nobody || result=$?
+if [ "${result}" -ne "0" ]; then
+    echo "test failed"
+    echo "smbstatus output:"
+    echo "${smbstatus}"
+    exit ${result}
+fi
+
+echo "Confirming with mount -t cifs that the filesystem is mounted without authentication"
+output=$(mount -t cifs 2>&1)
+echo "${output}" | grep -qE "on /cifs/127.0.0.1/pub.*sec=none" || result=$?
+if [ "${result}" -ne "0" ]; then
+    echo "test failed"
+    echo "mount -t cifs output:"
+    echo "${output}"
+    exit ${result}
+fi