mtest/t-userv: Check the expected output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/mtest/e-userv.sites b/mtest/e-userv.sites
new file mode 100644 (file)
index 0000000..e9108a6
--- /dev/null
+++ b/mtest/e-userv.sites
@@ -0,0 +1,35 @@
+# sites file autogenerated by make-secnet-sites
+# generated Sun Oct 20 13:21:06 2019, invoked by Uuser
+# use make-secnet-sites to turn this file into a
+# valid /etc/secnet/sites.conf file
+
+vpn test-example
+contact header@example.com
+dh 8db5f2c15ac96d9f3382d1ef4688fba14dc7908ae7dfd71a9cfe7f479a75d506dc53f159aeaf488bde073fe544bc91c099f101fcf60074f30c06e36263c03ca9e07931ce3fc235fe1171dc6d9316fb097bd4362891e2c36e234e7c16b038fd97b1f165c710e90537de66ee4f54001f5712b050d4e07de3fba07607b19b64f6c3 2
+hash sha1
+key-lifetime 72000000
+restrict-nets 192.168.0.0/16 10.0.0.0/8 172.16.0.0/12
+setup-timeout 2000
+setup-retries 5
+
+location outside Goutside
+restrict-nets 172.18.232.0/29
+
+location inside Ginside
+restrict-nets 172.18.232.8/29
+
+end-definitions
+
+# Section submitted by user Uuser, Sun Oct 20 13:21:06 2019
+# Checked by make-secnet-sites version 0.1.18
+
+vpn test-example
+location inside root
+site inside
+  networks 172.18.232.8/30
+  peer 172.18.232.9
+  address [127.0.0.1] 16910
+  mobile True
+  pubkey 1024 65537 130064631890186713927887504218626486455931306300999583387009075747001546036643522074275473238061323169592347601185592753550279410171535737146240085267000508853176463710554801101055212967131924064664249613912656320653505750073021702169423354903540699008756137338575553686987244488914481168225136440872431691669 inside@example.com
+
+# end of sites file

diff --git a/mtest/t-userv b/mtest/t-userv
index c1552bc5b63336302cbdfaa2c9e3cdf7d595d96e..e20121dd8d925696ff8b03579353f74367f4cb1e 100755 (executable)
--- a/mtest/t-userv
+++ b/mtest/t-userv
@@ -5,3 +5,9 @@ source mtest/common.tcl
 run-mss-userv Uuser Ginside -u \
     mtest/header.sites $tmp/groupfiles $tmp/out.sites Ginside \
     < mtest/Ginside.sites
+
+set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
+exec bash -c "
+    diff -u <($seddery mtest/e-userv.sites) \\
+            <($seddery $tmp/out.sites     )
+"