From 3bb6947d580a49068a33338c00ca64a93b7808f4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 7 Jul 2020 16:07:29 +0200
Subject: [PATCH] test dont force https

---
 test/test_ssl_certs.sh | 7 ++++---
 test/test_startup.sh   | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_ssl_certs.sh b/test/test_ssl_certs.sh
index 4f1fb55a..763e74a7 100755
--- a/test/test_ssl_certs.sh
+++ b/test/test_ssl_certs.sh
@@ -7,11 +7,9 @@
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
-# force it (or check it?)
-RCPROTO=https
 
 # Only works with evhtp and https
-if [ "${WITH_RESTCONF}" != "evhtp"  -o "$RCPROTO" = http ]; then
+if [ "${WITH_RESTCONF}" != "evhtp" -o "$RCPROTO" != https ]; then
     if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
 fi
 
@@ -262,3 +260,6 @@ fi
 stop_backend -f $cfg
 
 rm -rf $dir
+
+# unset conditional parameters
+unset RCPROTO
diff --git a/test/test_startup.sh b/test/test_startup.sh
index f785d8a7..b27cd3fe 100755
--- a/test/test_startup.sh
+++ b/test/test_startup.sh
@@ -38,7 +38,6 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_CLI_LINESCROLLING>0</CLICON_CLI_LINESCROLLING>
   <CLICON_STARTUP_MODE>init</CLICON_STARTUP_MODE>
-  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_XMLDB_FORMAT>$format</CLICON_XMLDB_FORMAT>
 </clixon-config>