Subversion Repositories vgwhois

Compare Revisions

Regard whitespace Rev 3 → Rev 4

/trunk/maintenance/qa-monitor/testcases/allpatterns
12,9 → 12,9
# Version 2014-11-25
#
 
require_once __DIR__ . '/../../shared/php_includes/common_functions.inc.php';
require_once __DIR__ . '/../../../shared/php_includes/common_functions.inc.php';
 
$patterns = glob(__DIR__ . '/../../main/pattern/*');
$patterns = glob(__DIR__ . '/../../../main/pattern/*');
 
#$bs = '\\b';
#$be = '\\b';
/trunk/maintenance/qa-monitor/testcases/batch
13,6 → 13,8
 
DIR=$( dirname "$0" )
 
TESTCASES_LIST="$DIR/../../config/testcases.list"
 
ARGS=()
 
shuffle() {
46,7 → 48,7
query="$f";
 
ARGS+=("$query")
done < "$DIR/../../config/testcases.list"
done < "$TESTCASES_LIST"
 
# TODO: does not work
#shuffle
/trunk/maintenance/qa-monitor/testcases/coverage
17,10 → 17,10
# => this is currently our behavior
# - Every line must be covered
 
require_once __DIR__ . '/../../shared/php_includes/common_functions.inc.php';
require_once __DIR__ . '/../../../shared/php_includes/common_functions.inc.php';
 
$testcases = array();
$testcases_tmp = file(__DIR__ . '/../config/testcases.list');
$testcases_tmp = file(__DIR__ . '/../../config/testcases.list');
foreach ($testcases_tmp as &$tc) {
$tc = trim($tc);
if ($tc == '') continue;
28,7 → 28,7
$testcases[] = $tc;
}
 
$patterns = glob(__DIR__ . '/../../main/pattern/*');
$patterns = glob(__DIR__ . '/../../../main/pattern/*');
 
$count_total = 0;
$count_covered = 0;
/trunk/maintenance/qa-monitor/testcases/highlighter
14,8 → 14,8
 
#mb_internal_encoding('utf-8');
 
require_once __DIR__ . '/../../shared/php_includes/common_functions.inc.php';
require_once __DIR__ . '/../../shared/php_includes/idna_convert.class.php';
require_once __DIR__ . '/../../../shared/php_includes/common_functions.inc.php';
require_once __DIR__ . '/../../../shared/php_includes/idna_convert.class.php';
 
$punycoder = new idna_convert();
 
/trunk/maintenance/qa-monitor/testcases/loc_gwhois
17,18 → 17,20
 
. "$DIR/../../config/testcases.conf"
 
GWI_EXEC="$DIR"/../../../main/gwhois
 
if [ $trytor -eq 1 ]; then
if [ -e "/usr/bin/vtor" ]; then
# We use vtor first, because it needs to cleanup temp files, which is only possible if it is not killed... Does this work?
vtor -a -r 1 -- "$DIR"/timeout.sh -t 10 -- gwhois $@
vtor -a -r 1 -- "$DIR"/timeout.sh -t 10 -- "$GWI_EXEC" $@
elif [ -e "/usr/bin/usewithtor" ]; then
"$DIR"/timeout.sh -t 10 -- usewithtor -- gwhois $@
"$DIR"/timeout.sh -t 10 -- usewithtor "$GWI_EXEC" $@
elif [ -e "/usr/bin/torify" ]; then
"$DIR"/timeout.sh -t 10 -- torify -- gwhois $@
"$DIR"/timeout.sh -t 10 -- torify "$GWI_EXEC" $@
else
echo "Warning: Cannot find any TOR proxy software. Will do the query without TOR." >&2
"$DIR"/timeout.sh -t 10 -- gwhois $@
"$DIR"/timeout.sh -t 10 -- "$GWI_EXEC" $@
fi
else
"$DIR"/timeout.sh -t 10 -- gwhois $@
"$DIR"/timeout.sh -t 10 -- "$GWI_EXEC" $@
fi
/trunk/maintenance/qa-monitor/testcases/single
17,8 → 17,7
 
DIR=$( dirname "$0" )
 
annotfile="$DIR/../../config/testcases.annot"
 
ANNOTATION_FILE="$DIR/../../config/testcases.annot"
TESTCASE_CACHE_FILE="$DIR/../../.cache/testcases"
 
# ---
57,12 → 56,12
}
 
function question {
if [ -f "$annotfile" ]; then
ANNOTS=$( cat "$annotfile" | grep -E "^$query:" )
if [ -f "$ANNOTATION_FILE" ]; then
ANNOTS=$( cat "$ANNOTATION_FILE" | grep -E "^$query:" )
if [ "$ANNOTS" != "" ]; then
echo ""
echo "********************"
echo "Notes in $annotfile :"
echo "Notes in $ANNOTATION_FILE :"
OLDIFS="$IFS"
IFS=$'\n'
for p in ${ANNOTS[@]}; do
132,7 → 131,7
echo "Cancelled"
else
echo "Note added to testcase of $query"
echo "$query: $note" >> "$annotfile"
echo "$query: $note" >> "$ANNOTATION_FILE"
fi
;;
[Xx]* )
/trunk/maintenance/qa-monitor/testcases/status
13,6 → 13,8
 
DIR=$( dirname "$0" )
 
TESTCASES_LIST="$DIR/../../config/testcases.list"
 
# ---
 
function FileAge() {
53,6 → 55,8
 
. "$DIR/../../config/testcases.conf"
 
CACHE_DIR="$DIR/../../.cache"
 
echo "Query Last activity Status"
echo "----------------------------------------------------------------------------------"
 
71,15 → 75,15
# query="$( basename $f )"
query="$f";
 
if [ ! -d "$DIR/../../.cache/testcases/expected" ]; then
mkdir -p "$DIR/../../.cache/testcases/expected"
if [ ! -d "$CACHE_DIR/testcases/expected" ]; then
mkdir -p "$CACHE_DIR/testcases/expected"
fi
expfile="$DIR/../../.cache/testcases/expected/$query"
expfile="$CACHE_DIR/testcases/expected/$query"
 
if [ ! -d "$DIR/../../.cache/testcases/checktimestamps" ]; then
mkdir -p "$DIR/../../.cache/testcases/checktimestamps"
if [ ! -d "$CACHE_DIR/testcases/checktimestamps" ]; then
mkdir -p "$CACHE_DIR/testcases/checktimestamps"
fi
tsfile="$DIR/../../.cache/testcases/checktimestamps/$query"
tsfile="$CACHE_DIR/testcases/checktimestamps/$query"
if [ -f "$tsfile" ]; then
# lastcheck="$( date -r "$tsfile" )"
lastcheck=$( HumanReadableAge $( FileAge "$tsfile" ))
87,10 → 91,10
lastcheck="never"
fi
 
if [ ! -d "$DIR/../../.cache/testcases/problems" ]; then
mkdir -p "$DIR/../../.cache/testcases/problems"
if [ ! -d "$CACHE_DIR/testcases/problems" ]; then
mkdir -p "$CACHE_DIR/testcases/problems"
fi
errfile="$DIR/../../.cache/testcases/problems/$query"
errfile="$CACHE_DIR/testcases/problems/$query"
if [ -f "$errfile" ]; then
cat "$errfile" | grep -E "at /(bin|usr|etc|var)/\S+ line" > /dev/null
PERLERR=$?
127,4 → 131,4
fi
 
printf "%-30s %-20s %-20s\n" "$query" "$lastcheck" "$status"
done < "$DIR/../../config/testcases.list"
done < "$TESTCASES_LIST"
/trunk/maintenance/qa-monitor/testcases/status_short
15,6 → 15,9
 
. "$DIR/../../config/testcases.conf"
 
CACHE_DIR="$DIR/../../.cache"
TESTCASES_LIST="$DIR/../../config/testcases.list"
 
count=0
 
while read f; do
31,15 → 34,15
# query="$( basename $f )"
query="$f";
 
if [ ! -d "$DIR/../../.cache/testcases/checktimestamps" ]; then
mkdir -p "$DIR/../../.cache/testcases/checktimestamps"
if [ ! -d "$CACHE_DIR/testcases/checktimestamps" ]; then
mkdir -p "$CACHE_DIR/testcases/checktimestamps"
fi
tsfile="$DIR/../../.cache/testcases/checktimestamps/$query"
tsfile="$CACHE_DIR/testcases/checktimestamps/$query"
 
if [ ! -d "$DIR/../../.cache/testcases/problems" ]; then
mkdir -p "$DIR/../../.cache/testcases/problems"
if [ ! -d "$CACHE_DIR/testcases/problems" ]; then
mkdir -p "$CACHE_DIR/testcases/problems"
fi
errfile="$DIR/../../.cache/testcases/problems/$query"
errfile="$CACHE_DIR/testcases/problems/$query"
 
if [ ! -f "$tsfile" ]; then
((count++));
49,7 → 52,7
((count++));
fi
 
done < "$DIR/../../config/testcases.list"
done < "$TESTCASES_LIST"
 
if [ $count -eq 0 ]; then
echo "[ OK ]"