From 61e88416424beabf10ac91c4db84793a383241c3 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 7 Feb 2022 14:41:50 +0100
Subject: [PATCH] test: sleep typo, override YANG_INSTALLDIR in docker tests

---
 CHANGELOG.md                      | 2 +-
 docker/main/startsystem.sh        | 5 +++++
 docker/main/startsystem_fcgi.sh   | 5 +++++
 docker/main/startsystem_native.sh | 5 +++++
 test/lib.sh                       | 4 ++--
 test/test_helloworld.sh           | 2 ++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa6eb1f1..d44230e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,7 @@ This release introduces a new autocli design with a clixon-autocli YANG file
     * Filter labels are added to the basemodel tree and then filtered out using `@remove:<label>`
     * This method reduces memory usage and is more generic
     * Backward compatible: can continue use the "old" trees.
-    * Note: while @datamodel etc are backward compatible, the autocli redesign is NOT backward compatible
+    * Note: while `@datamodel` etc are backward compatible, the autocli redesign is NOT backward compatible
       * see API changes
   * New autocli edit-mode design
      * Control which modes to use with `edit-mode-default`
diff --git a/docker/main/startsystem.sh b/docker/main/startsystem.sh
index 43f22de5..6a665851 100755
--- a/docker/main/startsystem.sh
+++ b/docker/main/startsystem.sh
@@ -64,6 +64,11 @@ SKIPLIST="test_api.sh test_c++.sh test_install.sh test_privileges.sh test_augmen
 # Parse yangmodels from https://github.com/YangModels/yang
 EOF
 
+# Patch to override YANG_INSTALLDIRS
+cat <<EOF >> /usr/local/bin/test/config.sh
+YANG_INSTALLDIR=/usr/local/share/clixon
+EOF
+
 # Patch yang syntax errors
 sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
 
diff --git a/docker/main/startsystem_fcgi.sh b/docker/main/startsystem_fcgi.sh
index c1fe8868..da597818 100755
--- a/docker/main/startsystem_fcgi.sh
+++ b/docker/main/startsystem_fcgi.sh
@@ -93,6 +93,11 @@ RCPROTO=http # Because nginx
 # Parse yangmodels from https://github.com/YangModels/yang
 EOF
 
+# Patch to override YANG_INSTALLDIRS
+cat <<EOF >> /usr/local/bin/test/config.sh
+YANG_INSTALLDIR=/usr/local/share/clixon
+EOF
+
 # Patch yang syntax errors
 sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
 
diff --git a/docker/main/startsystem_native.sh b/docker/main/startsystem_native.sh
index 063f83e4..9d0cf5bc 100755
--- a/docker/main/startsystem_native.sh
+++ b/docker/main/startsystem_native.sh
@@ -61,6 +61,11 @@ cat <<EOF > /usr/local/bin/test/site.sh
 SKIPLIST="test_api.sh test_client.sh test_c++.sh test_install.sh test_privileges.sh"
 EOF
 
+# Patch to override YANG_INSTALLDIRS
+cat <<EOF >> /usr/local/bin/test/config.sh
+YANG_INSTALLDIR=/usr/local/share/clixon
+EOF
+
 # Patch yang syntax errors
 sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
 
diff --git a/test/lib.sh b/test/lib.sh
index a9d673bc..767dfe93 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -121,10 +121,10 @@ else
 fi
 
 # Multiplication factor to sleep less than whole seconds
-DEMSLEEP=.2
+DEMSLEEP=0.2
 
 # Some sleep implementations cannot handle sub-seconds, change to 1s
-sleep $DEMPSLEEP || DEMSLEEP=1
+sleep $DEMSLEEP || DEMSLEEP=1
 
 # DEMWAIT is expressed in seconds, but really * DEMSLEEP
 let DEMLOOP=5*DEMWAIT
diff --git a/test/test_helloworld.sh b/test/test_helloworld.sh
index 5b111295..fb0d39e9 100755
--- a/test/test_helloworld.sh
+++ b/test/test_helloworld.sh
@@ -152,5 +152,7 @@ fi
 
 rm -rf $dir
 
+RCPROTO=  # This is sh not bash undef
+
 new "endtest"
 endtest