From: Andrew Lewis <nerf@judo.za.org>
Date: Mon, 28 Sep 2020 11:31:12 +0000 (+0200)
Subject: [Test] Fix fuzzy skip test
X-Git-Tag: 2.6~7^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82c152972e86f79464d1ba7ddf1425af03f7df43;p=rspamd.git

[Test] Fix fuzzy skip test
---

diff --git a/test/functional/cases/120_fuzzy/lib.robot b/test/functional/cases/120_fuzzy/lib.robot
index 2aa8034d1..fab223411 100644
--- a/test/functional/cases/120_fuzzy/lib.robot
+++ b/test/functional/cases/120_fuzzy/lib.robot
@@ -30,7 +30,7 @@ Fuzzy Skip Add Test Base
   Scan File  ${message}
   Create File  ${TMPDIR}/test.map
   Expect Symbol  R_TEST_FUZZY_DENIED
-  Append To File  ${TMPDIR}/skip_hash.map.tmp  670cfcba72a87bab689958a8af5c22593dc17c907836c7c26a74d1bb49add25adfa45a5f172e3af82c9c638e8eb5fc860c22c7e966e61a459165ef0b9e1acc89
+  Append To File  ${TMPDIR}/skip_hash.map.tmp  2d875d4737c59c4822fd01dadeba52a329de3933f766c6f167904c6a426bbfa7ea63a66bf807b25c5ee853baee58bfb18d3b423fcd13cfa7c3d77a840039a1ea
   Hard Link  ${TMPDIR}/skip_hash.map.tmp  ${TMPDIR}/skip_hash.map
   Scan File  ${message}
   Do Not Expect Symbol  R_TEST_FUZZY_DENIED
diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index fccf2e429..e310db4b5 100644
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -46,7 +46,8 @@ Check Rspamc Match String
 
 Do Not Expect Symbol
   [Arguments]  ${symbol}
-  Run Keyword And Expect Error  *  Expect Symbol  ${symbol}
+  ${passed} =  Run Keyword And Return Status  Expect Symbol  ${symbol}
+  Run Keyword If  ${passed}  Fail  Unexpected symbol ${symbol} was found in result
 
 Generic Setup
   [Arguments]  @{vargs}  &{kwargs}