From: Vsevolod Stakhov Date: Wed, 24 Jun 2020 15:16:07 +0000 (+0100) Subject: [Test] Use suite test X-Git-Tag: 2.6~291 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d3a66d3f1df4bf5393fd5a904fa37c2b0d9a232;p=rspamd.git [Test] Use suite test --- diff --git a/test/functional/cases/280_rules.robot b/test/functional/cases/280_rules.robot index aed23a1e7..a847fbbc7 100644 --- a/test/functional/cases/280_rules.robot +++ b/test/functional/cases/280_rules.robot @@ -1,6 +1,6 @@ *** Settings *** -Test Setup Rules Setup -Test Teardown Rules Teardown +Suite Setup Rules Setup +Suite Teardown Rules Teardown Library ${TESTDIR}/lib/rspamd.py Resource ${TESTDIR}/lib/rspamd.robot Variables ${TESTDIR}/lib/vars.py @@ -17,7 +17,7 @@ ${MESSAGE6} ${TESTDIR}/messages/pdf_encrypted.eml ${MESSAGE7} ${TESTDIR}/messages/pdf_js.eml ${MESSAGE8} ${TESTDIR}/messages/yand_forward.eml ${URL_TLD} ${TESTDIR}/../lua/unit/test_tld.dat -${RSPAMD_SCOPE} Test +${RSPAMD_SCOPE} Suite *** Test Cases *** diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot index 9a386619f..5a861400c 100644 --- a/test/functional/cases/300_rbl.robot +++ b/test/functional/cases/300_rbl.robot @@ -35,7 +35,7 @@ RBL RECEIVED HIT RBL FROM HIT WL ${result} = Scan Message With Rspamc ${MESSAGE} -i 4.3.2.4 Check Rspamc ${result} FAKE_RBL_CODE_2 inverse=True - Should Contain ${result.stdout} FAKE_WL_RBL_CODE_2 (1.00)[4.3.2.4:from] + Should Contain ${result.stdout} FAKE_WL_RBL_CODE_2 (0.00)[4.3.2.4:from] EMAILBL Compose Map 1 ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url14.eml