From 5c18fc959590d12066ec6c9bea9500befaa9e8b4 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Sat, 21 Jul 2018 19:05:03 -0400 Subject: [PATCH] use resty-cli for running lua unit tests --- build/Dockerfile | 11 +++++++++++ build/busted | 3 +++ build/test-lua.sh | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 build/busted diff --git a/build/Dockerfile b/build/Dockerfile index 331b2acd6..49de86fa6 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -44,6 +44,17 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" WORKDIR $GOPATH +ENV RESTY_CLI_VERSION 0.22rc2 +ENV RESTY_CLI_SHA 1ec64d204469a04da553c95eaafb2e5601a03acb8f26cc10ae16b15525228c12 +RUN set -eux; \ + url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \ + wget -O resty_cli.tgz "$url"; \ + echo "${RESTY_CLI_SHA} *resty_cli.tgz" | sha256sum -c -; \ + tar -C /tmp -xzf resty_cli.tgz; \ + rm resty_cli.tgz; \ + mv /tmp/resty-cli-${RESTY_CLI_VERSION}/bin/* /usr/local/bin/; \ + resty -V + RUN luarocks install luacheck \ && luarocks install busted 2.0.rc12 diff --git a/build/busted b/build/busted new file mode 100755 index 000000000..4c5299de2 --- /dev/null +++ b/build/busted @@ -0,0 +1,3 @@ +#!/usr/bin/env resty + +require "busted.runner"({ standalone = false }) diff --git a/build/test-lua.sh b/build/test-lua.sh index acd739566..2786daa17 100755 --- a/build/test-lua.sh +++ b/build/test-lua.sh @@ -18,4 +18,7 @@ set -o errexit set -o nounset set -o pipefail -busted ${BUSTED_ARGS} ./rootfs/etc/nginx/lua/test; +export LUA_PATH="/usr/local/lib/lua/?.lua;;" +export LUA_CPATH="/usr/local/lib/lua/?.so;/usr/lib/lua-platform-path/lua/5.1/?.so;;" + +resty ./build/busted ${BUSTED_ARGS} ./rootfs/etc/nginx/lua/test;