Improve tests

.travis.yml

@@ -10,13 +10,34 @@ addons:
     - shellcheck
 
 script:
- - export SHELLCHECK_OPTS="-e SC1091"
- - shellcheck *.sh extras/*.sh
- - sudo sed -i "/debian unstable/d" /etc/apt/sources.list
- - sudo sh vpnsetup.sh
- - sleep 15
- - sudo netstat -anpu | grep pluto
- - sudo netstat -anpu | grep xl2tpd
+  - export SHELLCHECK_OPTS="-e SC1091"
+  - shellcheck *.sh extras/*.sh
+  - sudo sed -i "/debian unstable/d" /etc/apt/sources.list
+  - sudo VPN_IPSEC_PSK='vpn_psk'
+    VPN_USER='vpn_user'
+    VPN_PASSWORD='vpn_pass' sh vpnsetup.sh
+  - sleep 10
+  - sudo netstat -anpu | grep pluto
+  - sudo netstat -anpu | grep xl2tpd
+  - sudo grep 'vpn_psk' /etc/ipsec.secrets
+  - sudo grep 'vpn_user' /etc/ppp/chap-secrets
+  - sudo grep 'vpn_pass' /etc/ppp/chap-secrets
+  - sudo grep 'vpn_user' /etc/ipsec.d/passwd
+  - sudo sh vpnsetup.sh
+  - sleep 10
+  - sudo netstat -anpu | grep pluto
+  - sudo netstat -anpu | grep xl2tpd
+  - sed -i -e "/^YOUR_IPSEC_PSK/s/''/'vpn_psk'/"
+           -e "/^YOUR_USERNAME/s/''/'vpn_user'/"
+           -e "/^YOUR_PASSWORD/s/''/'vpn_pass'/" vpnsetup.sh
+  - sudo sh vpnsetup.sh
+  - sleep 10
+  - sudo netstat -anpu | grep pluto
+  - sudo netstat -anpu | grep xl2tpd
+  - sudo grep 'vpn_psk' /etc/ipsec.secrets
+  - sudo grep 'vpn_user' /etc/ppp/chap-secrets
+  - sudo grep 'vpn_pass' /etc/ppp/chap-secrets
+  - sudo grep 'vpn_user' /etc/ipsec.d/passwd
 
 notifications:
   email: