Fix issues in the tests.

diff --git a/test/functional/cases/encrypted_gtube.sh b/test/functional/cases/encrypted_gtube.sh
index 9b5ff27e6b82ea24c774b9ad073bead2800b6259..016a1f6ec956fb6e68309e73cd7d73f1623d2b99 100644 (file)
--- a/test/functional/cases/encrypted_gtube.sh
+++ b/test/functional/cases/encrypted_gtube.sh
@@ -6,4 +6,4 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/trivial.conf"
 run_rspamd
 run_rspamc symbols --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
        "$TEST_DIRNAME/messages/gtube.eml"
-check_output "$output" 'Action: reject'
\ No newline at end of file
+check_output 'Action: reject'
\ No newline at end of file

diff --git a/test/functional/cases/learn_bad.sh b/test/functional/cases/learn_bad.sh
index 199e77b7fa6dba2c04b8db2751bd081dc7970ae1..5c5410c912574d015e72d493d3e8ced58fd64e2f 100644 (file)
--- a/test/functional/cases/learn_bad.sh
+++ b/test/functional/cases/learn_bad.sh
@@ -8,5 +8,5 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'cannot open backend'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'cannot open backend'
\ No newline at end of file

diff --git a/test/functional/cases/learn_simple.sh b/test/functional/cases/learn_simple.sh
index 59a0bac5b98a22616827f2f40394c0afa9a4c9c1..d44056918511cca37a16bd5e0e28ff11723102d8 100644 (file)
--- a/test/functional/cases/learn_simple.sh
+++ b/test/functional/cases/learn_simple.sh
@@ -8,10 +8,10 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_SPAM'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_SPAM'
\ No newline at end of file

diff --git a/test/functional/cases/learn_siphash.sh b/test/functional/cases/learn_siphash.sh
index a91fe9ae91e19796930ed4e4fd80ad81d3f632e6..dcab7410a9dca2bff6fef30bff8e44673b5ed17f 100644 (file)
--- a/test/functional/cases/learn_siphash.sh
+++ b/test/functional/cases/learn_siphash.sh
@@ -9,10 +9,10 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_SPAM'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_SPAM'
\ No newline at end of file

diff --git a/test/functional/cases/learn_xxhash.sh b/test/functional/cases/learn_xxhash.sh
index 896874b13dd763be4435a4d85935879594f46f2f..2b75b9aa5ebc11f7e46b7d174b0a96ea97fad70d 100644 (file)
--- a/test/functional/cases/learn_xxhash.sh
+++ b/test/functional/cases/learn_xxhash.sh
@@ -9,10 +9,10 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_SPAM'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_SPAM'
\ No newline at end of file

diff --git a/test/functional/cases/relearn-sqlite.sh b/test/functional/cases/relearn-sqlite.sh
index 1b2ac4a8c861480130d45c3ce298d693771e1d00..f678b319c5aadaac8ab9ca2dbc4c671e6b4ff16b 100644 (file)
--- a/test/functional/cases/relearn-sqlite.sh
+++ b/test/functional/cases/relearn-sqlite.sh
@@ -9,20 +9,20 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_SPAM'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_SPAM'
 
 run_rspamc learn_ham \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_HAM'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_HAM'
\ No newline at end of file

diff --git a/test/functional/cases/relearn.sh b/test/functional/cases/relearn.sh
index d1f86192288c89186762c68bf8448ea1891282d8..9d52e431035add1c0e9bda1378936bf0a29c40af 100644 (file)
--- a/test/functional/cases/relearn.sh
+++ b/test/functional/cases/relearn.sh
@@ -8,20 +8,20 @@ export RSPAMD_CONFIG="$TEST_DIRNAME/configs/stats.conf" \
 run_rspamd
 run_rspamc learn_spam \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_SPAM'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_SPAM'
 
 run_rspamc learn_ham \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'success.*true'
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'success.*true'
        
 run_rspamc symbols \
         --key y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'BAYES_HAM'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'BAYES_HAM'
\ No newline at end of file

diff --git a/test/functional/cases/spamc_gtube.sh b/test/functional/cases/spamc_gtube.sh
index 8b63eb5fd15a5dd456549cded00c39f49b4134da..ffad990ebd526e0364cc58bffca0e91105443746 100644 (file)
--- a/test/functional/cases/spamc_gtube.sh
+++ b/test/functional/cases/spamc_gtube.sh
@@ -5,4 +5,4 @@
 export RSPAMD_CONFIG="$TEST_DIRNAME/configs/trivial.conf"
 run_rspamd
 run perl "$TEST_DIRNAME/cases/spamc.pl" "$TEST_DIRNAME/messages/gtube.eml"
-check_output $output 'GTUBE'
\ No newline at end of file
+check_output 'GTUBE'
\ No newline at end of file

diff --git a/test/functional/cases/symbol_depends.sh b/test/functional/cases/symbol_depends.sh
index 5bc6941c346c6fda24120acd81dd8b23222e25bc..bcf718f7ffd835270580dd4751e0406c424255f8 100644 (file)
--- a/test/functional/cases/symbol_depends.sh
+++ b/test/functional/cases/symbol_depends.sh
@@ -2,7 +2,7 @@
 
 . ${TEST_DIRNAME}/functions.sh
 
-sed -e 's|@@LUA_SCRIPT@@|${CURDIR}/functional/cases/deps.lua|' < \
+sed -e 's|@@LUA_SCRIPT@@|${TESTDIR}/cases/deps.lua|' < \
        "$TEST_DIRNAME/configs/lua_test.conf" > \
        "$TMPDIR/rspamd.conf"
 export RSPAMD_CONFIG="$TMPDIR/rspamd.conf" \
@@ -10,5 +10,5 @@ export RSPAMD_CONFIG="$TMPDIR/rspamd.conf" \
 run_rspamd
 
 run_rspamc symbols \
-       "$BATS_TEST_DIRNAME/messages/spam_message.eml"
-check_output $output 'DEP10'
\ No newline at end of file
+       "$TEST_DIRNAME/messages/spam_message.eml"
+check_output 'DEP10'
\ No newline at end of file

diff --git a/test/functional/functions.sh b/test/functional/functions.sh
index b96931a7401dfffbe39b607715436d61ff2a5d4b..7301669a2d8aaa1d2840e851a99563aeb85b68cc 100644 (file)
--- a/test/functional/functions.sh
+++ b/test/functional/functions.sh
@@ -60,14 +60,13 @@ function teardown()
 
 function check_output() 
 {
-       _output="$1"
-       _pattern="$2"
+       _pattern="$1"
 
-       echo "$_output" | egrep "$_pattern" > /dev/null 2>&1
+       echo "$output" | egrep "$_pattern" > /dev/null 2>&1
        
        _saved_exit=$?
        if [ $_saved_exit -ne 0 ] ; then
-               echo "$_output" > ${TMPDIR}/rspamc.output
+               echo "$output" > ${TMPDIR}/rspamc.err
                save_error 'rspamc' "Expected pattern $_pattern is not found"
                return $_saved_exit
        fi
@@ -86,13 +85,13 @@ function run_rspamc()
                *) _host="localhost:56789" ;;
        esac
 
-       output=`$_rspamc -h $_host $@ 2>&1`
+       output=`$_rspamc -h $_host $_command $@ 2>&1`
+       echo "$output" > ${TMPDIR}/rspamc.output
 
        if [ $? -eq 0 ] ; then
                export output
                return 0
        else
-               echo $output > ${TMPDIR}/rspamc.output
                save_error 'rspamc' "Wrong exit code"
        fi
 
@@ -105,12 +104,12 @@ function run()
        shift
 
        output=`$_command $@ 2>&1`
+       echo "$output" > "${TMPDIR}/${_command}.output"
 
        if [ $? -eq 0 ] ; then
                export output
                return 0
        else
-               echo $output > ${TMPDIR}/${_command}.output
                save_error "${_command}" "Wrong exit code"
        fi