From 6bac41890d6e9ae9de58d09e8989f3dd694135a4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 16 Jun 2021 14:44:42 +0200
Subject: [PATCH] github actions: try docker test

---
 .github/workflows/ci.yml | 38 ++------------------------------------
 test/lib.sh              | 14 +++++++-------
 test/test_augment.sh     |  2 +-
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c91aeb6..fac8faa8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,41 +13,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: install cligen
-      run: (git clone https://github.com/clicon/cligen.git && cd cligen && ./configure && make && sudo make install)
-    - name: install libevent
-      run: sudo apt install -y libevent-dev libssl-dev
-    - name: install libevhtp
-      run: (git clone https://github.com/clicon/clixon-libevhtp.git && cd clixon-libevhtp && ./configure && make && sudo make install)
-    - name: clixon and www-data users
-      run:  sudo useradd -M -U clicon && sudo usermod -a -G clicon www-data
-    - name: prepare clixon tests
-      run: sudo apt install -y libcurl4-openssl-dev
     - name: configure
       run: ./configure --with-restconf=native
-    - name: make
-      run: make
-    - name: make install
-      run: sudo make install
-    - name: make install-include
-      run: sudo make install-include
-    - name: make example
-      run: (cd example; make)
-    - name: install example
-      run: (cd example; sudo make install)
-    - name: make util
-      run: (cd util; make)
-    - name: install util
-      run: (cd util; sudo make install)
-    - name: ldconfig
-      run: sudo ldconfig
-    - name: prepare test1
-      run: echo "#!/usr/bin/env bash" > test/site.sh
-    - name: prepare test2
-      run: echo "IPv6=true" >> test/site.sh
-    - name: prepare test3
-      run: echo "SKIPLIST=\"test_api.sh test_client.sh test_c++.sh test_install.sh test_privileges.sh\"" >> test/site.sh
-    - name: test
-      run: (cd test; ./all.sh)
-#    - name: make test # this is docker test
-#      run: make test
\ No newline at end of file
+    - name: make test # this is docker test
+      run: make test
\ No newline at end of file
diff --git a/test/lib.sh b/test/lib.sh
index 182181dd..60ba56c8 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -337,12 +337,12 @@ function wait_backend(){
     reply=$(echo "<rpc $DEFAULTNS><ping $LIBNS/></rpc>]]>]]>" | $clixon_netconf -qef $cfg 2> /dev/null) 
     let i=0;
     while [[ $reply != "<rpc-reply"* ]]; do
-	echo "sleep $DEMSLEEP"
+#	echo "sleep $DEMSLEEP"
 	sleep $DEMSLEEP
 	reply=$(echo "<rpc $ÐEFAULTSNS $LIBNS><ping/></rpc>]]>]]>" | clixon_netconf -qef $cfg 2> /dev/null)
-	echo "reply:$reply"
+#	echo "reply:$reply"
 	let i++;
-	echo "wait_backend  $i"
+#	echo "wait_backend  $i"
 	if [ $i -ge $DEMLOOP ]; then
 	    err "backend timeout $DEMWAIT seconds"
 	fi
@@ -382,18 +382,18 @@ function stop_restconf(){
 # Reasons for not working: if you run native is nginx running?
 # @note assumes port=80 if RCPROTO=http and port=443 if RCPROTO=https
 function wait_restconf(){
-    echo "curl $CURLOPTS $* $RCPROTO://localhost/restconf"
+#    echo "curl $CURLOPTS $* $RCPROTO://localhost/restconf"
     hdr=$(curl $CURLOPTS $* $RCPROTO://localhost/restconf 2> /dev/null)
-    echo "hdr:\"$hdr\""
+#    echo "hdr:\"$hdr\""
     let i=0;
     while [[ $hdr != *"200"* ]]; do
-	echo "wait_restconf $i"
+#	echo "wait_restconf $i"
 	if [ $i -ge $DEMLOOP ]; then
 	    err1 "restconf timeout $DEMWAIT seconds"
 	fi
 	sleep $DEMSLEEP
 	hdr=$(curl $CURLOPTS $* $RCPROTO://localhost/restconf 2> /dev/null)
-	echo "hdr:\"$hdr\""
+#	echo "hdr:\"$hdr\""
 	let i++;
     done
     if [ $valgrindtest -eq 3 ]; then 
diff --git a/test/test_augment.sh b/test/test_augment.sh
index 4d85480f..360039d8 100755
--- a/test/test_augment.sh
+++ b/test/test_augment.sh
@@ -198,7 +198,7 @@ if [ $BE -ne 0 ]; then
 	err
     fi
     new "start backend -s init -f $cfg"
-    start_backend -s init -f $cfg -D 1 -l e
+    start_backend -s init -f $cfg
 fi
 
 new "wait backend"