diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95394dc9..18c53565 100644 --- a/.github/workflows/ci.yml +++ b/.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) diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 988c2bff..73b5aadf 100644 --- a/docker/main/Dockerfile +++ b/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 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 diff --git a/docker/main/Dockerfile.fcgi b/docker/main/Dockerfile.fcgi index 33f550ce..b9c92451 100644 --- a/docker/main/Dockerfile.fcgi +++ b/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 diff --git a/docker/main/Dockerfile.native b/docker/main/Dockerfile.native index 6514715a..712f5e35 100644 --- a/docker/main/Dockerfile.native +++ b/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 diff --git a/test/test_pagination_config.sh b/test/test_pagination_config.sh index 1da42d5b..482d7983 100755 --- a/test/test_pagination_config.sh +++ b/test/test_pagination_config.sh @@ -152,9 +152,10 @@ 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 +expect ./test_pagination_expect.exp "$cfg" "$xpath" "uint64-numbers 18" "uint64-numbers 19" +if [ $? -ne 0 ]; then + err1 "Failed: CLI show paginate config scroll using expect" +fi if [ $BE -ne 0 ]; then new "Kill backend" diff --git a/test/test_pagination_state.sh b/test/test_pagination_state.sh index eaba9553..bcc2b2d5 100755 --- a/test/test_pagination_state.sh +++ b/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