From ac3cb44d85ab9f2407d397425a3119d35fe32786 Mon Sep 17 00:00:00 2001
From: Sylvain Lamontagne <sylvain.lamontagne@gmail.com>
Date: Tue, 20 Sep 2016 12:01:56 -0400
Subject: [PATCH] Added test for multiple extra options

---
 test/tests/conf_options/container.sh | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/test/tests/conf_options/container.sh b/test/tests/conf_options/container.sh
index f7ed45b..dbb8cd5 100644
--- a/test/tests/conf_options/container.sh
+++ b/test/tests/conf_options/container.sh
@@ -7,13 +7,13 @@ abort() { cat <<< "$@" 1>&2; exit 1; }
 #
 # Generate openvpn.config file
 #
-read -d '' EXTRA_SERVER_CONF << EOF
+read -d '' MULTILINE_EXTRA_SERVER_CONF << EOF
 management localhost 7505
 max-clients 10
 EOF
 
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
-ovpn_genconfig -u udp://$SERV_IP -f 1400 -e "$EXTRA_SERVER_CONF"
+ovpn_genconfig -u udp://$SERV_IP -f 1400 -e "$MULTILINE_EXTRA_SERVER_CONF" -e "duplicate-cn" -e "topology subnet"
 
 #
 # grep for config lines from openvpn.conf
@@ -28,6 +28,7 @@ CONFIG_MATCH_VERB=$(busybox grep verb /etc/openvpn/openvpn.conf)
 CONFIG_REQUIRED_FRAGMENT="fragment 1400"
 CONFIG_MATCH_FRAGMENT=$(busybox grep fragment /etc/openvpn/openvpn.conf)
 
+## Tests for extra configs
 # 3. management config
 CONFIG_REQUIRED_MANAGEMENT="^management localhost 7505"
 CONFIG_MATCH_MANAGEMENT=$(busybox grep management /etc/openvpn/openvpn.conf)
@@ -36,6 +37,14 @@ CONFIG_MATCH_MANAGEMENT=$(busybox grep management /etc/openvpn/openvpn.conf)
 CONFIG_REQUIRED_MAX_CLIENTS="^max-clients 10"
 CONFIG_MATCH_MAX_CLIENTS=$(busybox grep max-clients /etc/openvpn/openvpn.conf)
 
+# 5. duplicate-cn config
+CONFIG_REQUIRED_DUPCN="^duplicate-cn"
+CONFIG_MATCH_DUPCN=$(busybox grep duplicate-cn /etc/openvpn/openvpn.conf)
+
+# 6. topology config
+CONFIG_REQUIRED_TOPOLOGY="^topology subnet"
+CONFIG_MATCH_TOPOLOGY=$(busybox grep 'topology subnet' /etc/openvpn/openvpn.conf)
+
 #
 # Tests
 #
@@ -61,9 +70,24 @@ else
   abort "==> Config match not found: $CONFIG_REQUIRED_MANAGEMENT != $CONFIG_MATCH_MANAGEMENT"
 fi
 
+
 if [[ $CONFIG_MATCH_MAX_CLIENTS =~ $CONFIG_REQUIRED_MAX_CLIENTS ]]
 then
   echo "==> Config match found: $CONFIG_REQUIRED_MAX_CLIENTS == $CONFIG_MATCH_MAX_CLIENTS"
 else
   abort "==> Config match not found: $CONFIG_REQUIRED_MAX_CLIENTS != $CONFIG_MATCH_MAX_CLIENTS"
 fi
+
+if [[ $CONFIG_MATCH_DUPCN =~ $CONFIG_REQUIRED_DUPCN ]]
+then
+  echo "==> Config match found: $CONFIG_REQUIRED_DUPCN == $CONFIG_MATCH_DUPCN"
+else
+  abort "==> Config match not found: $CONFIG_REQUIRED_DUPCN != $CONFIG_MATCH_DUPCN"
+fi
+
+if [[ $CONFIG_MATCH_TOPOLOGY =~ $CONFIG_REQUIRED_TOPOLOGY ]]
+then
+  echo "==> Config match found: $CONFIG_REQUIRED_TOPOLOGY == $CONFIG_MATCH_TOPOLOGY"
+else
+  abort "==> Config match not found: $CONFIG_REQUIRED_TOPOLOGY != $CONFIG_MATCH_TOPOLOGY"
+fi