v0.22.1 cli flag and behavior, and test output improvement
This commit is contained in:
lixen committed
1 parent
71d1b82f83
commit
4eba6fc834
89 files changed
+1531
-661
No files matched your search
+13
-9
@@ -18,6 +18,9 @@ if [[ ${FORCE_COLOR:-0} != 0 ]] || [[ -t 1 && -z ${NO_COLOR:-} ]]; then
|
||||
else
|
||||
C_BOLD='' C_DIM='' C_RED='' C_GREEN='' C_YELLOW='' C_CYAN='' C_OFF=''
|
||||
fi
|
||||
# Rules fit a narrower terminal; wider ones keep 64 columns
|
||||
COLS=${COLUMNS:-$(stty size <&2 2>/dev/null | cut -d' ' -f2)}
|
||||
[[ $COLS =~ ^[0-9]+$ ]] && ((COLS >= 20 && COLS < 64)) || COLS=64
|
||||
|
||||
usage() {
|
||||
sed -n '2,/^[^#]/s/^# \{0,1\}//p' "$0"
|
||||
@@ -55,9 +58,9 @@ e2e_init() { # "$@" of the script
|
||||
|
||||
# --- output ---
|
||||
|
||||
rule() { local s='' n=$1; while ((n-- > 0)); do s+='─'; done; printf '%s' "$s"; }
|
||||
rule() { local s='' n=$1; while ((n-- > 0)); do s+=${2:-─}; done; printf '%s' "$s"; } # N [CHAR]
|
||||
short() { if [[ $1 == "$PWD"/* ]]; then printf '%s' "${1#"$PWD"/}"; else printf '%s' "$1"; fi; }
|
||||
section() { printf '\n%s── %s %s%s\n' "$C_BOLD$C_CYAN" "$1" "$(rule $((60 - ${#1})))" "$C_OFF"; }
|
||||
section() { printf '\n%s── %s %s%s\n' "$C_BOLD$C_CYAN" "$1" "$(rule $((COLS - 4 - ${#1})))" "$C_OFF"; }
|
||||
info() { printf ' %s·%s %s\n' "$C_DIM" "$C_OFF" "$*"; }
|
||||
|
||||
pass() { E2E_PASSED=$((E2E_PASSED + 1)); printf ' %sPASS%s %s\n' "$C_BOLD$C_GREEN" "$C_OFF" "$1"; }
|
||||
@@ -67,20 +70,21 @@ check() { if (($2)); then pass "$1"; else fail "$1"; fi; } # LABEL 1|0
|
||||
is() { [[ $1 == "$2" ]] && echo 1 || echo 0; } # ACTUAL EXPECTED
|
||||
is_set() { [[ -n $1 ]] && echo 1 || echo 0; }
|
||||
|
||||
# guide TITLE, the body on stdin: "> " lines are commands, " NNNNN " lines
|
||||
# ports, lines ending in ":" headings.
|
||||
# guide TITLE, the body on stdin, between two rules and without a side border,
|
||||
# so lines wrapped by a narrow terminal stay readable: "> " lines are commands,
|
||||
# " NNNNN " lines ports, lines ending in ":" headings.
|
||||
guide() {
|
||||
local line
|
||||
printf '\n%s┌── %s %s%s\n' "$C_BOLD" "$1" "$(rule $((59 - ${#1})))" "$C_OFF"
|
||||
printf '\n%s══ %s %s%s\n' "$C_BOLD" "$1" "$(rule $((COLS - 4 - ${#1})) ═)" "$C_OFF"
|
||||
while IFS= read -r line; do
|
||||
case $line in
|
||||
'> '*) line=" $C_CYAN${line#> }$C_OFF" ;;
|
||||
' '[0-9][0-9][0-9][0-9][0-9]' '*) line=" $C_YELLOW${line:2:5}$C_OFF${line:7}" ;;
|
||||
*:) line="$C_BOLD$line$C_OFF" ;;
|
||||
esac
|
||||
printf '%s│%s %s\n' "$C_BOLD" "$C_OFF" "$line"
|
||||
printf '%s\n' "$line"
|
||||
done
|
||||
printf '%s└%s%s\n' "$C_BOLD" "$(rule 63)" "$C_OFF"
|
||||
printf '%s%s%s\n' "$C_BOLD" "$(rule "$COLS" ═)" "$C_OFF"
|
||||
}
|
||||
|
||||
# write_env NAME=VALUE...: $RUN/env, which the guide's commands source
|
||||
@@ -119,7 +123,7 @@ summary() {
|
||||
[[ $name == "${ABORTED:-}" ]] || excerpt "$name" '^([^ ]+ ERROR |Error: )'
|
||||
done
|
||||
fi
|
||||
printf '%s%s%s\n' "$C_DIM" "$(rule 64)" "$C_OFF"
|
||||
printf '%s%s%s\n' "$C_DIM" "$(rule "$COLS")" "$C_OFF"
|
||||
if ((E2E_FAILED)); then
|
||||
printf '%sRESULT: FAILURES%s (%s); logs in %s/\n' "$C_BOLD$C_RED" "$C_OFF" "$counts" "$(short "$LOG")"
|
||||
exit 1
|
||||
@@ -134,7 +138,7 @@ summary() {
|
||||
|
||||
skip_all() { # REASON: nothing in the script applies to this host
|
||||
skip "$1"
|
||||
printf '%s%s%s\n%sRESULT: SKIPPED%s\n' "$C_DIM" "$(rule 64)" "$C_OFF" "$C_BOLD$C_YELLOW" "$C_OFF"
|
||||
printf '%s%s%s\n%sRESULT: SKIPPED%s\n' "$C_DIM" "$(rule "$COLS")" "$C_OFF" "$C_BOLD$C_YELLOW" "$C_OFF"
|
||||
exit 77
|
||||
}
|
||||
|
||||
|
||||
Executable
+74
@@ -0,0 +1,74 @@
|
||||
#!/usr/bin/env bash
|
||||
# logwisp pipe test: without a configuration file lw is a filter, stdin to
|
||||
# stdout line for line, without loss, quiet on stderr, exiting 0 at the end of
|
||||
# input. One-shot: both modes run the checks; no ports.
|
||||
# Requires: bash 5+, coreutils (timeout, seq, head, cmp, od). Linux dev host only.
|
||||
|
||||
set -u
|
||||
. "$(dirname -- "${BASH_SOURCE[0]}")/lib.sh"
|
||||
|
||||
RUN=$E2E_DIR/run/pipe
|
||||
e2e_init "$@"
|
||||
|
||||
section "Setup"
|
||||
need
|
||||
rm -rf "$RUN"
|
||||
mkdir -p "$RUN/bare" "$RUN/withfile" "$LOG"
|
||||
printf '[logging]\noutput = "stderr"\n' >"$RUN/withfile/logwisp.toml"
|
||||
# lw DIR ARGS...: in DIR, with no user configuration or LOGWISP_ variable
|
||||
lw() {
|
||||
(
|
||||
cd "$RUN/$1" || exit 1
|
||||
for v in $(compgen -e LOGWISP_); do unset "$v"; done
|
||||
HOME=$RUN timeout 30 "$BIN" "${@:2}"
|
||||
)
|
||||
}
|
||||
info "runs lw in $(short "$RUN")/bare (no file) and $(short "$RUN")/withfile"
|
||||
|
||||
section "Checks"
|
||||
# 1. line for line, without loss, and nothing on stderr
|
||||
seq 1 200000 >"$RUN/seq.txt"
|
||||
lw bare <"$RUN/seq.txt" >"$RUN/seq.out" 2>"$LOG/seq.err"
|
||||
rc=$?
|
||||
check "200000 lines pass unchanged, exit $rc" $((rc == 0))
|
||||
check "output identical to input" "$(cmp -s "$RUN/seq.txt" "$RUN/seq.out" && echo 1 || echo 0)"
|
||||
check "nothing on stderr without a configuration file" "$( [[ -s $LOG/seq.err ]] && echo 0 || echo 1)"
|
||||
|
||||
# 2. sources are subscribed before they start: the first line is not lost
|
||||
check "a single line arrives" "$(is "$(printf 'first\n' | lw bare)" first)"
|
||||
|
||||
# 3. terminators: CRLF stripped, blank lines skipped, last line unterminated
|
||||
check "\\r\\n, blank and unterminated lines" "$(is "$(printf 'a\r\nb\n\nc' | lw bare | od -An -c | tr -s ' ')" " a \n b \n c \n")"
|
||||
|
||||
# 4. a line over the 1 MiB entry cap continues in the next entry, no byte lost
|
||||
head -c 2500000 /dev/zero | tr '\0' x | lw bare >"$RUN/long.out"
|
||||
check "2.5 MB line: entries of $(awk '{printf "%s ", length($0)}' "$RUN/long.out")" \
|
||||
"$(is "$(awk '{n += length($0)} END {print NR, n}' "$RUN/long.out")" "3 2500000")"
|
||||
|
||||
# 5. a slow reader slows lw down instead of losing lines
|
||||
n=$(seq 1 50000 | lw bare | { sleep 1; wc -l; })
|
||||
check "slow reader receives all 50000 lines ($n)" "$((n == 50000))"
|
||||
|
||||
# 6. a reader that leaves ends lw as it ends cat: SIGPIPE
|
||||
seq 1 5000000 | lw bare | head -1 >/dev/null
|
||||
rc=${PIPESTATUS[1]}
|
||||
check "reader gone: lw exits on SIGPIPE ($rc)" "$((rc == 141))"
|
||||
|
||||
# 7. filters and formats compose with stdin and stdout
|
||||
check "--filter keeps matching lines" "$(is "$(printf 'x INFO\ny ERROR\n' | lw bare --filter include,patterns=ERROR)" "y ERROR")"
|
||||
|
||||
# 8. control characters pass to a pipe unchanged and are escaped on request
|
||||
check "control bytes reach a pipe unchanged" "$(is "$(printf 'a\033[31mb\n' | lw bare | od -An -tx1 | tr -d ' ')" 611b5b33316d620a)"
|
||||
check "escape=always writes them as <hex>" "$(is "$(printf 'a\033[31mb\n' | lw bare --sink console,escape=always)" 'a<1b>[31mb')"
|
||||
|
||||
# 9. at the end of input the file sink writes its queue before lw exits
|
||||
seq 1 5000 | lw bare --sink "file,directory=$RUN/fsink,name=out,buffer_size=10000"
|
||||
n=$(cat "$RUN"/fsink/out*.log 2>/dev/null | wc -l)
|
||||
check "file sink holds all 5000 lines at exit ($n)" "$((n == 5000))"
|
||||
|
||||
# 10. a configuration file makes lw a service: info on stderr, data on stdout
|
||||
out=$(printf 'x\n' | lw withfile 2>"$LOG/withfile.err")
|
||||
check "with a file: data still on stdout" "$(is "$out" x)"
|
||||
check "with a file: info logging on stderr" "$(grep -q 'LogWisp starting' "$LOG/withfile.err" && echo 1 || echo 0)"
|
||||
|
||||
summary
|
||||
Reference in new issue
Block a user