Test: Added expect to Dockerfile and made sure pagination test worked in docker

.github/workflows/ci.yml

@@ -13,8 +13,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: install expect
-      run: sudo apt install -y expect
 # 1) checkout and compile natively
     - name: install cligen
       run: (git clone https://github.com/clicon/cligen.git && cd cligen && ./configure && make && sudo make install)

docker/main/Dockerfile

@@ -85,6 +85,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
 WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
+RUN install *.exp /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon
@@ -101,7 +102,7 @@ MAINTAINER Olof Hagsand <olof@hagsand.se>
 RUN apk add --update flex bison fcgi-dev
 
 # Test-specific (for test scripts)
-RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip
+RUN apk add --update sudo curl procps grep make bash expect
 
 # Create clicon user and group
 RUN adduser -D -H clicon

docker/main/Dockerfile.fcgi

@@ -96,6 +96,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
 WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
+RUN install *.exp /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon
@@ -117,7 +118,7 @@ RUN adduser -D -H -G www-data www-data
 RUN apk add --update nginx
 
 # Test-specific (for test scripts)
-RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip
+RUN apk add --update sudo curl procps grep make bash expect
 
 # Expose nginx port for restconf
 EXPOSE 80

docker/main/Dockerfile.native

@@ -108,6 +108,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
 WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
+RUN install *.exp /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon
@@ -132,7 +133,7 @@ RUN apk add --update openssl
 RUN apk add --update nghttp2
 
 # Test-specific (for test scripts)
-RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip - but CAP_SYS_ADMIN isssue
+RUN apk add --update sudo curl procps grep make bash expect 
 
 # Expose https port for restconf
 EXPOSE 80/tcp

test/test_pagination_config.sh

@@ -153,8 +153,9 @@ wait_backend
 xpath="/es:members/es:member[es:member-id=\'bob\']/es:favorites/es:uint64-numbers"
 new "cli show pagination config using expect"
 expect ./test_pagination_expect.exp "$cfg" "$xpath" "uint64-numbers 18" "uint64-numbers 19"
-
-#$clixon_cli -f $cfg -l o -1 show pagination xpath /es:members/es:member[es:member-id=\'bob\']/es:favorites/es:uint64-numbers cli
+if [ $? -ne 0 ]; then
+    err1 "Failed: CLI show paginate config scroll using expect"
+fi
 
 if [ $BE -ne 0 ]; then
     new "Kill backend"

test/test_pagination_state.sh

@@ -163,8 +163,11 @@ if [ -n "$(type expect 2> /dev/null)" ]; then
 
     testrun_start "/es:audit-logs/es:audit-log"
     
-    newtest "CLI scroll test using expect"
+    new "CLI scroll test using expect"
     expect ./test_pagination_expect.exp "$cfg" "$xpath" bob3 bob4
+    if [ $? -ne 0 ]; then
+	err1 "Failed: CLI show paginate state scroll using expect"
+    fi
 
     testrun_stop