From 3affe0c5db3249dd5dc16f3c48763733536b59d4 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Wed, 10 Nov 2021 22:49:12 -0600
Subject: [PATCH] Update tests

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

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 0ce2012..ef2bc44 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -410,14 +410,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"
@@ -886,14 +888,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"
@@ -1297,14 +1301,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e8999fa..c82f78c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -439,14 +439,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"
@@ -915,14 +917,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"
@@ -1326,14 +1330,16 @@ jobs:
 
           bash ikev2.sh --addclient vpnclient2 --exportclient vpnclient2 2>&1 | grep -i "invalid"
 
-          bash ikev2.sh --listclients | grep "vpnclient1"
-          bash ikev2.sh --listclients | grep "vpnclient2"
+          bash ikev2.sh --listclients | grep "vpnclient1 \+valid"
+          bash ikev2.sh --listclients | grep "vpnclient2 \+valid"
 
           bash ikev2.sh --revokeclient nonexistclient 2>&1 | grep -i "does not exist"
           bash ikev2.sh --revokeclient vpnclient2 <<ANSWERS
           y
           ANSWERS
 
+          bash ikev2.sh --listclients | grep "vpnclient2 \+revoked"
+
           bash ikev2.sh --revokeclient vpnclient2 2>&1 | grep -i "already been revoked"
           bash ikev2.sh --exportclient vpnclient2 2>&1 | grep -i "revoked"
           bash ikev2.sh -h 2>&1 | grep -i "usage:"