mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-11 05:29:30 +00:00
Test collect.sh. Use --run-time instead of --interval for collect loop. Fix and require per-test test names in util/test-bash-functions. Fix OPT_ERR in parse_options.sh.
This commit is contained in:
Daniel Nichter
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
TESTS=24
|
||||
TESTS=19
|
||||
|
||||
TMPFILE="$TEST_TMPDIR/parse-opts-output"
|
||||
TMPDIR="$TEST_TMPDIR"
|
||||
@@ -14,11 +14,105 @@ source "$LIB_DIR/safeguards.sh"
|
||||
source "$LIB_DIR/alt_cmds.sh"
|
||||
source "$LIB_DIR/collect.sh"
|
||||
|
||||
parse_options "$T_LIB_DIR/samples/bash/po002.sh" -- --defaults-file=/tmp/12345/my.sandbox.cnf
|
||||
parse_options "$T_LIB_DIR/samples/bash/po002.sh" --run-time 1 -- --defaults-file=/tmp/12345/my.sandbox.cnf
|
||||
|
||||
collect "$TMPDIR/collect" "2011_12_05"
|
||||
# Prefix (with path) for the collect files.
|
||||
local p="$TMPDIR/collect/2011_12_05"
|
||||
|
||||
# Default collect, no extras like gdb, tcpdump, etc.
|
||||
collect "$TMPDIR/collect" "2011_12_05" > $p-output 2>&1
|
||||
|
||||
# Even if this system doesn't have all the cmds, collect should still
|
||||
# create all the default files.
|
||||
ls -1 $TMPDIR/collect | sort > $TMPDIR/collect-files
|
||||
no_diff \
|
||||
$TMPDIR/collect-files \
|
||||
$T_LIB_DIR/samples/bash/collect001.txt \
|
||||
"Default collect files"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'Avail' $p-df" \
|
||||
"df"
|
||||
|
||||
# hostname is the last thing collected, so if it's ok,
|
||||
# then the sub reached its end.
|
||||
is \
|
||||
"`cat $p-hostname`" \
|
||||
"`hostname`" \
|
||||
"hostname"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q -i 'buffer pool' $p-innodbstatus1" \
|
||||
"innodbstatus1"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q -i 'buffer pool' $p-innodbstatus2" \
|
||||
"innodbstatus2"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'error log seems to be /tmp/12345/data/mysqld.log' $p-output" \
|
||||
"Finds MySQL error log"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'Status information:' $p-log_error" \
|
||||
"debug"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'COMMAND[ ]\+PID[ ]\+USER' $p-lsof" \
|
||||
"lsof"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'buf/buf0buf.c' $p-mutex-status1" \
|
||||
"mutex-status1"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'buf/buf0buf.c' $p-mutex-status2" \
|
||||
"mutex-status2"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q '^| Uptime' $p-mysqladmin" \
|
||||
"mysqladmin ext"
|
||||
|
||||
cmd_ok \
|
||||
"grep -qP 'Database\tTable\tIn_use' $p-opentables1" \
|
||||
"opentables1"
|
||||
|
||||
cmd_ok \
|
||||
"grep -qP 'Database\tTable\t\In_use' $p-opentables2" \
|
||||
"opentables2"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q '1. row' $p-processlist1" \
|
||||
"processlist1"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q '1. row' $p-processlist2" \
|
||||
"processlist2"
|
||||
|
||||
cmd_ok \
|
||||
"grep -q 'mysqld' $p-ps" \
|
||||
"ps"
|
||||
|
||||
cmd_ok \
|
||||
"grep -qP '^warning_count\t\d' $p-variables" \
|
||||
"variables"
|
||||
|
||||
local iters=$(cat $p-df | grep -c '^TS ')
|
||||
is "$iters" "1" "1 iteration/1s run time"
|
||||
|
||||
# ###########################################################################
|
||||
# Try longer run time.
|
||||
# ###########################################################################
|
||||
|
||||
parse_options "$T_LIB_DIR/samples/bash/po002.sh" --run-time 2 -- --defaults-file=/tmp/12345/my.sandbox.cnf
|
||||
|
||||
rm $TMPDIR/collect/*
|
||||
|
||||
collect "$TMPDIR/collect" "2011_12_05" > $p-output 2>&1
|
||||
|
||||
local iters=$(cat $p-df | grep -c '^TS ')
|
||||
is "$iters" "2" "2 iteration/2s run time"
|
||||
|
||||
# ############################################################################
|
||||
# Done
|
||||
# ############################################################################
|
||||
exit
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
TESTS=24
|
||||
TESTS=25
|
||||
|
||||
TMPFILE="$TEST_TMPDIR/parse-opts-output"
|
||||
|
||||
@@ -14,17 +14,15 @@ source "$LIB_DIR/parse_options.sh"
|
||||
TMPDIR="$TEST_TMPDIR"
|
||||
parse_options "$T_LIB_DIR/samples/bash/po001.sh" "" 2>$TMPFILE
|
||||
|
||||
TEST_NAME="No warnings or errors"
|
||||
is "`cat $TMPFILE`" ""
|
||||
is "`cat $TMPFILE`" "" "No warnings or errors"
|
||||
|
||||
TEST_NAME="Default opts"
|
||||
is "$OPT_STRING_OPT" ""
|
||||
is "$OPT_STRING_OPT2" "foo"
|
||||
is "$OPT_TYPELESS_OPTION" ""
|
||||
is "$OPT_NOPTION" "yes"
|
||||
is "$OPT_INT_OPT" ""
|
||||
is "$OPT_INT_OPT2" "42"
|
||||
is "$OPT_VERSION" ""
|
||||
is "$OPT_STRING_OPT" "" "Default string option"
|
||||
is "$OPT_STRING_OPT2" "foo" "Default string option with default"
|
||||
is "$OPT_TYPELESS_OPTION" "" "Default typeless option"
|
||||
is "$OPT_NOPTION" "yes" "Defailt neg option"
|
||||
is "$OPT_INT_OPT" "" "Default int option"
|
||||
is "$OPT_INT_OPT2" "42" "Default int option with default"
|
||||
is "$OPT_VERSION" "" "--version"
|
||||
|
||||
# ############################################################################
|
||||
# Specify some opts, but use default values for the rest.
|
||||
@@ -32,14 +30,13 @@ is "$OPT_VERSION" ""
|
||||
|
||||
parse_options "$T_LIB_DIR/samples/bash/po001.sh" --int-opt 50 --typeless-option --string-opt bar
|
||||
|
||||
TEST_NAME="User-specified opts with defaults"
|
||||
is "$OPT_STRING_OPT" "bar" # specified
|
||||
is "$OPT_STRING_OPT2" "foo"
|
||||
is "$OPT_TYPELESS_OPTION" "yes" # specified
|
||||
is "$OPT_NOPTION" "yes"
|
||||
is "$OPT_INT_OPT" "50" # specified
|
||||
is "$OPT_INT_OPT2" "42"
|
||||
is "$OPT_VERSION" ""
|
||||
is "$OPT_STRING_OPT" "bar" "Specified string option (spec)"
|
||||
is "$OPT_STRING_OPT2" "foo" "Default string option with default (spec)"
|
||||
is "$OPT_TYPELESS_OPTION" "yes" "Specified typeless option (spec)"
|
||||
is "$OPT_NOPTION" "yes" "Default neg option (spec)"
|
||||
is "$OPT_INT_OPT" "50" "Specified int option (spec)"
|
||||
is "$OPT_INT_OPT2" "42" "Default int option with default (spec)"
|
||||
is "$OPT_VERSION" "" "--version (spec)"
|
||||
|
||||
# ############################################################################
|
||||
# Negate an option like --no-option.
|
||||
@@ -47,23 +44,20 @@ is "$OPT_VERSION" ""
|
||||
|
||||
parse_options "$T_LIB_DIR/samples/bash/po001.sh" --no-noption
|
||||
|
||||
TEST_NAME="Negated option"
|
||||
is "$OPT_STRING_OPT" ""
|
||||
is "$OPT_STRING_OPT2" "foo"
|
||||
is "$OPT_TYPELESS_OPTION" ""
|
||||
is "$OPT_NOPTION" "no" # negated
|
||||
is "$OPT_INT_OPT" ""
|
||||
is "$OPT_INT_OPT2" "42"
|
||||
is "$OPT_VERSION" ""
|
||||
is "$OPT_STRING_OPT" "" "Default string option (neg)"
|
||||
is "$OPT_STRING_OPT2" "foo" "Default string option with default (net)"
|
||||
is "$OPT_TYPELESS_OPTION" "" "Default typeless option (neg)"
|
||||
is "$OPT_NOPTION" "no" "Negated option (neg)"
|
||||
is "$OPT_INT_OPT" "" "Default int option (neg)"
|
||||
is "$OPT_INT_OPT2" "42" "Default int option with default (neg)"
|
||||
is "$OPT_VERSION" "" "--version (neg)"
|
||||
|
||||
# ############################################################################
|
||||
# Short form.
|
||||
# ############################################################################
|
||||
|
||||
parse_options "$T_LIB_DIR/samples/bash/po001.sh" -v
|
||||
|
||||
TEST_NAME="Short form"
|
||||
is "$OPT_VERSION" "yes"
|
||||
is "$OPT_VERSION" "yes" "Short form"
|
||||
|
||||
# ############################################################################
|
||||
# An unknown option should produce an error.
|
||||
@@ -74,13 +68,9 @@ is "$OPT_VERSION" "yes"
|
||||
parse_options "$T_LIB_DIR/samples/bash/po001.sh" --foo >$TMPFILE 2>&1
|
||||
)
|
||||
local err=$?
|
||||
TEST_NAME="Non-zero exit on unknown option"
|
||||
is "$err" "1"
|
||||
|
||||
TEST_NAME="Error on unknown option"
|
||||
cmd_ok "grep -q 'Unknown option: foo' $TMPFILE"
|
||||
is "$err" "1" "Non-zero exit on unknown option"
|
||||
cmd_ok "grep -q 'Unknown option: foo' $TMPFILE" "Error on unknown option"
|
||||
|
||||
# ############################################################################
|
||||
# Done
|
||||
# ############################################################################
|
||||
exit
|
||||
|
||||
@@ -5,40 +5,31 @@ TESTS=9
|
||||
source "$LIB_DIR/log_warn_die.sh"
|
||||
source "$LIB_DIR/tmpdir.sh"
|
||||
|
||||
TEST_NAME="TMPDIR not defined"
|
||||
is "$TMPDIR" ""
|
||||
is "$TMPDIR" "" "TMPDIR not defined"
|
||||
|
||||
TEST_NAME="mk_tmpdir makes secure tmpdir"
|
||||
mk_tmpdir
|
||||
cmd_ok "test -d $TMPDIR"
|
||||
cmd_ok "test -d $TMPDIR" "mk_tmpdir makes secure tmpdir"
|
||||
|
||||
tmpdir=$TMPDIR;
|
||||
|
||||
TEST_NAME="rm_tmpdir"
|
||||
rm_tmpdir
|
||||
cmd_ok "test ! -d $tmpdir"
|
||||
cmd_ok "test ! -d $tmpdir" "rm_tmpdir"
|
||||
|
||||
TEST_NAME="rm_tmpdir resets TMPDIR"
|
||||
is "$TMPDIR" ""
|
||||
is "$TMPDIR" "" "rm_tmpdir resets TMPDIR"
|
||||
|
||||
# --tmpdir
|
||||
OPT_TMPDIR="/tmp/use--tmpdir"
|
||||
|
||||
TEST_NAME="TMPDIR not defined"
|
||||
is "$TMPDIR" ""
|
||||
is "$TMPDIR" "" "TMPDIR not defined"
|
||||
|
||||
TEST_NAME="--tmpdir does not exist yet"
|
||||
cmd_ok "test ! -d $OPT_TMPDIR"
|
||||
cmd_ok "test ! -d $OPT_TMPDIR" "--tmpdir does not exist yet"
|
||||
|
||||
mk_tmpdir
|
||||
TEST_NAME="mk_tmpdir uses --tmpdir"
|
||||
is "$TMPDIR" "/tmp/use--tmpdir"
|
||||
is "$TMPDIR" "/tmp/use--tmpdir" "mk_tmpdir uses --tmpdir"
|
||||
|
||||
TEST_NAME="mk_tmpdir creates --tmpdir"
|
||||
cmd_ok "test -d $TMPDIR"
|
||||
cmd_ok "test -d $TMPDIR" "mk_tmpdir creates --tmpdir"
|
||||
|
||||
tmpdir=$TMPDIR;
|
||||
|
||||
TEST_NAME="rm_tmpdir removes --tmpdir"
|
||||
rm_tmpdir
|
||||
cmd_ok "test ! -d $tmpdir"
|
||||
cmd_ok "test ! -d $tmpdir" "rm_tmpdir removes --tmpdir"
|
||||
|
||||
Reference in New Issue
Block a user