From c098e02ff4c3ee30cc4689b9bb67ba2811e42374 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 11 Jan 2022 22:55:20 -0600
Subject: [PATCH] Update tests

---
 .github/workflows/cron.yml | 10 ++++++----
 .github/workflows/main.yml | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 4115a31..890609c 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -530,7 +530,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.3 4.4 4.5; do
+          for ver in 4.3 4.4 4.5 4.6; do
             [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           "$shc" vpnup.sh <<ANSWERS
@@ -1004,7 +1004,7 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-ubuntu
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.3 4.4 4.5; do
+          for ver in 4.3 4.4 4.5 4.6; do
             [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           "$shc" vpnup.sh <<ANSWERS
@@ -1400,7 +1400,8 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          for ver in 4.5; do
+          for ver in 4.5 4.6; do
+            ipsec whack --shutdown || true
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
           y
@@ -1416,7 +1417,8 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-alpine
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5; do
+          for ver in 4.5 4.6; do
+            ipsec whack --shutdown || true
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
           y
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f2927b..a60c2b3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -559,7 +559,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.3 4.4 4.5; do
+          for ver in 4.3 4.4 4.5 4.6; do
             [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           "$shc" vpnup.sh <<ANSWERS
@@ -1033,7 +1033,7 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-ubuntu
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.3 4.4 4.5; do
+          for ver in 4.3 4.4 4.5 4.6; do
             [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           "$shc" vpnup.sh <<ANSWERS
@@ -1429,7 +1429,8 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          for ver in 4.5; do
+          for ver in 4.5 4.6; do
+            ipsec whack --shutdown || true
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
           y
@@ -1445,7 +1446,8 @@ jobs:
           wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-alpine
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5; do
+          for ver in 4.5 4.6; do
+            ipsec whack --shutdown || true
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
           y