From e6604e18cbe585b199cf02fc9b816216138bcd56 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 3 Mar 2022 22:07:25 -0600
Subject: [PATCH] Update tests

---
 .github/workflows/test_set_1.yml | 20 ++++++++++++++++++--
 .github/workflows/test_set_2.yml | 21 ++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml
index 1080bab..0317615 100644
--- a/.github/workflows/test_set_1.yml
+++ b/.github/workflows/test_set_1.yml
@@ -88,7 +88,7 @@ jobs:
           cp -f /opt/src/scripts/extras/quickstart.sh .
           cp -f /opt/src/scripts/extras/vpnuninstall.sh ./vpnunst.sh
           sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
-            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            -e '/curl /a sed -i \x27/status=0/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh\x27 "$tmpdir/vpn.sh"' \
             vpnsetup.sh quickstart.sh
 
           for vpnsc in vpnsetup.sh quickstart.sh; do
@@ -136,7 +136,9 @@ jobs:
           else
             cp -f /opt/src/scripts/vpnsetup_amzn.sh ./vpnsetup.sh
           fi
-          sed -i '/swan_ver_latest=/s/^/#/' vpnsetup.sh
+          sed -i -e '/swan_ver_latest=/s/^/#/' \
+            -e '/status=0/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            vpnsetup.sh
 
           VPN_IPSEC_PSK='your_ipsec_pre_shared_key' \
           VPN_USER='your_vpn_username' \
@@ -159,6 +161,7 @@ jobs:
           ipsec status
           ipsec status | grep -q l2tp-psk
           ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
 
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
@@ -168,12 +171,25 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -ld /etc/ipsec.d/vpnclient.mobileconfig
+          ls -ld /etc/ipsec.d/vpnclient.sswan
+          ls -ld /etc/ipsec.d/vpnclient.p12
+
           ls -l /usr/bin/ikev2.sh
           ls -l /opt/src/ikev2.sh
 
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
+          rm -f /etc/ipsec.d/vpnclient*
+
           cp -f /opt/src/scripts/extras/ikev2setup.sh ./ikev2.sh # hwdsl2
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
+          bash ikev2.sh --removeikev2 <<ANSWERS
+          y
+          ANSWERS
+
+          restart_ipsec
+
           bash ikev2.sh <<ANSWERS
 
 
diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml
index 331bfa6..f6b6d36 100644
--- a/.github/workflows/test_set_2.yml
+++ b/.github/workflows/test_set_2.yml
@@ -91,7 +91,7 @@ jobs:
           cp -f "$GITHUB_WORKSPACE"/extras/quickstart.sh .
           cp -f "$GITHUB_WORKSPACE"/extras/vpnuninstall.sh ./vpnunst.sh
           sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
-            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            -e '/curl /a sed -i \x27/status=0/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh\x27 "$tmpdir/vpn.sh"' \
             vpnsetup.sh quickstart.sh
 
           for vpnsc in vpnsetup.sh quickstart.sh; do
@@ -144,7 +144,9 @@ jobs:
           else
             cp -f "$GITHUB_WORKSPACE"/vpnsetup_ubuntu.sh ./vpnsetup.sh
           fi
-          sed -i '/swan_ver_latest=/s/^/#/' vpnsetup.sh
+          sed -i -e '/swan_ver_latest=/s/^/#/' \
+            -e '/status=0/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            vpnsetup.sh
 
           VPN_IPSEC_PSK='your_ipsec_pre_shared_key' \
           VPN_USER='your_vpn_username' \
@@ -154,7 +156,6 @@ jobs:
           bash vpnsetup.sh
 
           if [ "$os_type" = "alpine" ]; then
-            ipsec initnss
             xl2tpd -c /etc/xl2tpd/xl2tpd.conf
           fi
           restart_ipsec
@@ -170,6 +171,7 @@ jobs:
           ipsec status
           ipsec status | grep -q l2tp-psk
           ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
 
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
@@ -179,12 +181,25 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -ld /etc/ipsec.d/vpnclient.mobileconfig
+          ls -ld /etc/ipsec.d/vpnclient.sswan
+          ls -ld /etc/ipsec.d/vpnclient.p12
+
           ls -l /usr/bin/ikev2.sh
           ls -l /opt/src/ikev2.sh
 
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
+          rm -f /etc/ipsec.d/vpnclient*
+
           cp -f "$GITHUB_WORKSPACE"/extras/ikev2setup.sh ./ikev2.sh
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
+          bash ikev2.sh --removeikev2 <<ANSWERS
+          y
+          ANSWERS
+
+          restart_ipsec
+
           bash ikev2.sh <<ANSWERS