Merge pull request #3413 from korgoth1/master

[TEST] New bitcoin addr

test/functional/cases/280_rules.robot

@@ -60,6 +60,14 @@ BITCOIN ADDR
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/btc.eml
   Should Contain  ${result.stdout}  BITCOIN_ADDR
 
+BITCOIN ADDR 2
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/btc2.eml
+  Should Contain  ${result.stdout}  BITCOIN_ADDR
+
+BITCOIN ADDR 3
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/btc3.eml
+  Should Contain  ${result.stdout}  BITCOIN_ADDR  
+
 RCVD_COUNT_ONE
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/btc.eml
   Should Contain  ${result.stdout}  RCVD_COUNT_ONE

test/functional/messages/btc.eml

@@ -9,13 +9,13 @@ Content-Type: multipart/alternative; boundary="00000000000004de7805a4489190"
 
 --0000000000004bee6805a4484c02
 Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: base64
+Content-Transfer-Encoding: 8bit
 
 1EHbEvWFkR3oY93EKym1bweaWUW2PKe6v9
 
 --0000000000004bee6805a4484c02
 Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
+Content-Transfer-Encoding: 8bit
 
 1EHbEvWFkR3oY93EKym1bweaWUW2PKe6v9
 

test/functional/messages/btc2.eml

@@ -0,0 +1,22 @@
+Received: by mail-lf1-f54.gulugulu.com with SMTP id j14so14439709lfg.9
+        for <test@test.ru>; Mon, 27 Apr 2020 09:54:21 -0700 (PDT)
+From: test@test.com
+Date: Mon, 27 Apr 2020 19:54:10 +0300
+Message-ID: <CA+1S=h4aGimA6vSBJF=t1F+5z-Mua5+Cimf+NU_NDWJk8ZNOcw@mail.gmail.com>
+Subject: Fwd:
+To: <test@test.ru>
+Content-Type: multipart/alternative; boundary="00000000000004de7805a4489190"
+
+--0000000000004bee6805a4484c02
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+qq5llzv84punzrx2vlv33m5d5jm3tnr8aqqz3kwel3 - bech32
+
+--0000000000004bee6805a4484c02
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+qq5llzv84punzrx2vlv33m5d5jm3tnr8aqqz3kwel3 - bech32
+
+--0000000000004bee6805a4484c02--

test/functional/messages/btc3.eml

@@ -0,0 +1,22 @@
+Received: by mail-lf1-f54.gulugulu.com with SMTP id j14so14439709lfg.9
+        for <test@test.ru>; Mon, 27 Apr 2020 09:54:21 -0700 (PDT)
+From: test@test.com
+Date: Mon, 27 Apr 2020 19:54:10 +0300
+Message-ID: <CA+1S=h4aGimA6vSBJF=t1F+5z-Mua5+Cimf+NU_NDWJk8ZNOcw@mail.gmail.com>
+Subject: Fwd:
+To: <test@test.ru>
+Content-Type: multipart/alternative; boundary="00000000000004de7805a4489190"
+
+--0000000000004bee6805a4484c02
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+bitcoincash:qztslqhavnjcgth9zwu6dw0jjcfy4zahfy7vf0smwpp
+
+--0000000000004bee6805a4484c02
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+bitcoincash:qztslqhavnjcgth9zwu6dw0jjcfy4zahfy7vf0smwpp
+
+--0000000000004bee6805a4484c02--

test/functional/messages/yand_forward.eml

@@ -1,4 +1,4 @@
-Return-Path: <test@test.eu>
+Return-Path: <test@test.net>
 Received: from mx7.test.ru ([0.0.0.0] verified)
   by mail.test.ru (test mail)
   with ESMTP id 60578244