From: Vsevolod Stakhov Date: Wed, 13 Feb 2019 09:37:34 +0000 (+0000) Subject: [Test] Another try to fix test X-Git-Tag: 1.9.0~162 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b3656cc8c1dcde3a9d99c323768e090ab70d50c1;p=rspamd.git [Test] Another try to fix test --- diff --git a/test/functional/data/schema_2/data.rspamd.sql b/test/functional/data/schema_2/data.rspamd.sql index d7d950ad5..d6b9becaf 100644 --- a/test/functional/data/schema_2/data.rspamd.sql +++ b/test/functional/data/schema_2/data.rspamd.sql @@ -1,56 +1 @@ -(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'), -(toDate(now()),'2018-08-21 11:24:15','example.sourceforge.net','users.sourceforge.net','127.0.0.0',0.69,0,4198,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','spamassassin-commits-admin','yyyyason','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b8c4054a876b3e6593b0c7ea427045ba'), -(toDate(now()),'2018-08-21 11:24:15','freshrpms.net','camperquake.de','127.0.0.0',1.69,0,3663,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','ralf','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'bb4fcb9417cb59838b2c83c4b4342ffa'), -(toDate(now()),'2018-08-21 11:24:15','freshrpms.net','rpmforge.net','127.0.0.0',1.69,0,3934,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','matthias','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'2b1b347f25159ca1ea8d4a9ee5187ba8'), -(toDate(now()),'2018-08-21 11:24:15','linux.ie','steorn.com','127.0.0.0',1.19,0,2934,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','ilug-admin','carlos.luna','','','irish linux users\' group ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c95d8ffd4f70a91328eeec15c452ab6b'), -(toDate(now()),'2018-08-21 11:24:15','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,1078,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'5a46062bde8cce224ea90aa134e10da1'), -(toDate(now()),'2018-08-21 11:24:15','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,2088,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'cf0d79f76e51a3e6c5bcfdfdac094685'), -(toDate(now()),'2018-08-21 11:24:15','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,2388,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'2ab3790853d8bf1a90623b6d788abeb0'), -(toDate(now()),'2018-08-21 11:24:15','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,1124,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'47362127e1870aa9aaf3eef8ae5c749b'), -(toDate(now()),'2018-08-21 11:24:15','xent.com','mithral.com','127.0.0.0',0.69,0,3546,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','beberg','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'f4d74c809ba48b987fd6271baf82c12f'), -(toDate(now()),'2018-08-21 11:24:20','baesystems.com','baesystems.com','127.0.0.0',0.9,0,3341,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','robert.chambers','robert.chambers','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'835aaf36a75a56ce93dfa3badaeb92eb'), -(toDate(now()),'2018-08-21 11:24:20','example.sourceforge.net','telus.net','127.0.0.0',1.69,0,3852,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','spamassassin-talk-admin','cfortune','','','talk about spamassassin ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'8e799460b63b7919b4c4587dadd7b063'), -(toDate(now()),'2018-08-21 11:24:20','freshrpms.net','egwn.net','127.0.0.0',1.69,0,5074,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','matthias','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'3950ac78c11ec35d55cb56c265d9474a'), -(toDate(now()),'2018-08-21 11:24:20','freshrpms.net','fluid.com','127.0.0.0',0.69,0,3712,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','tengel','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'61936d1c00246dc8410391c9e5f03f5a'), -(toDate(now()),'2018-08-21 11:24:20','linux.ie','eircom.net','127.0.0.0',1.3,0,2763,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','ilug-admin','cout','','','irish linux users\' group ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'d1e819de70503d5ebfa49b6708703942'), -(toDate(now()),'2018-08-21 11:24:20','petting-zoo.net','','127.0.0.0',1.8900000000000001,0,2538,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','0xdeadbeef-request','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c6046b370d90b6b13a4788557e77cf24'), -(toDate(now()),'2018-08-21 11:24:20','returns.groups.yahoo.com','hotmail.com','127.0.0.0',0.89,0,4135,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','sentto-2242572-56028-1034088521-zzzz=example.com','skitster','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c22813bc4c29a3f5fa0dd1cbd598c7c8'), -(toDate(now()),'2018-08-21 11:24:20','returns.groups.yahoo.com','srv0.ems.ed.ac.uk','127.0.0.0',1.3900000000000001,0,5651,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','sentto-2242572-53809-1031308404-zzzz=example.com','martin','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'a10e11dcdc3d527ade0f5e85bc583f78'), -(toDate(now()),'2018-08-21 11:24:20','returns.groups.yahoo.com','earthlink.net','127.0.0.0',1.3900000000000001,0,2885,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','sentto-2242572-60166-1038789202-yyyy=spamassassin.taint.org','billjac','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'5a914e03141f3f7099e50be362c007c2'), -(toDate(now()),'2018-08-21 11:24:20','returns.groups.yahoo.com','srv0.ems.ed.ac.uk','127.0.0.0',1.3900000000000001,0,5706,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','sentto-2242572-53809-1031308404-zzzz=spamassassin.taint.org','martin','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'a10e11dcdc3d527ade0f5e85bc583f78'), -(toDate(now()),'2018-08-21 11:24:20','returns.groups.yahoo.com','bestirishmusic.com','127.0.0.0',1.3900000000000001,0,3709,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','sentto-2242572-55915-1033992114-zzzz=spamassassin.taint.org','webmaster','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'5e3597c0f14b241c915c161c462c4804'), -(toDate(now()),'2018-08-21 11:24:20','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,2168,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'472774888e942d317fecc91724b304f8'), -(toDate(now()),'2018-08-21 11:24:20','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,1125,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'54b07928d68e59fb370ea89f2efdaabd'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','ianbell.com','127.0.0.0',0.69,0,15012,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','fork','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'64216f07ed5995242c78fe27b537c30b'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','techmonkeys.net','127.0.0.0',0.69,0,4501,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','cdale','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'a96c963bc4d5297e3ebdf4f2ea27927f'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','hotmail.com','127.0.0.0',1.69,0,2606,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','fork_list','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'9d743f10d435a607f9179d9429eb0ea1'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','vertexdev.com','127.0.0.0',1.19,0,3224,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','jeff','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'5008d567ff90facc36d94be316d4e0fe'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','panix.com','127.0.0.0',2.69,0,2366,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','lgonze','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'154b831310873a800b92169b7e049a8f'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','magnesium.net','127.0.0.0',0.69,0,6039,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','bitbitch','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'0fcc0fdd0995b10de6f07585354e2941'), -(toDate(now()),'2018-08-21 11:24:20','xent.com','canada.com','127.0.0.0',0.69,0,3685,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','garym','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c0796f14caaf4e02ca683309021f6812'), -('2017-08-21','2017-08-21 11:24:25','freshrpms.net','egwn.net','127.0.0.0',1.69,0,3500,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','matthias','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'9848f3ace4d8b54ed52061cf0330d64f'), -('2017-08-21','2017-08-21 11:24:25','xent.com','endeavors.com','127.0.0.0',0.69,0,3561,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','gbolcer','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'a5109e184c129e5521438be5375e7804'), -('2017-08-21','2017-08-21 11:24:26','comcast.net','','undefined',6.9,0,4682,'unknown','unknown','unknown','unknown','unknown','unknown',0,'add header','tim.one','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'9367812a3c0f279aa3dbf691e9d9ec11'), -('2017-08-21','2017-08-21 11:24:26','example.sourceforge.net','pobox.com','127.0.0.0',1.19,0,4167,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','razor-users-admin','wstearns','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'8dd6255d0616f90f16ec8cfbba496143'), -('2017-08-21','2017-08-21 11:24:26','xent.com','canada.com','127.0.0.0',0.69,0,3031,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','garym','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'e5ccbf749700f93ece4a41907d81593b'), -('2017-08-21','2017-08-21 11:24:36','example.com','example.com','127.0.0.0',0.9,0,2154,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'27e6cbfca0423d5c2aa6fa6731670699'), -('2017-08-21','2017-08-21 11:24:36','example.com','example.com','127.0.0.0',0.9,0,1630,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b35cf34eb7186872f7c035a7bd450e92'), -('2017-08-21','2017-08-21 11:24:36','example.com','panasas.com','127.0.0.0',0.69,0,4910,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','exmh-users-admin','welch','','','discussion list for exmh users ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'7987eec136f5391445df5bfbe64d4b33'), -('2017-08-21','2017-08-21 11:24:36','example.sourceforge.net','gmx.net','127.0.0.0',1.69,0,5667,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','spamassassin-talk-admin','msquadrat.nospamplease','','','talk about spamassassin ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'2c6645233690c3bd7677fc5a6b637000'), -('2017-08-21','2017-08-21 11:24:36','freshrpms.net','bellsouth.net','127.0.0.0',0.69,0,4817,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','lance_tt','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'7201979c9c64847048d2e20512a6b5d9'), -('2017-08-21','2017-08-21 11:24:36','freshrpms.net','ckloiber.com','127.0.0.0',0.69,0,3161,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rpm-zzzlist-admin','ckloiber','','','freshrpms rpm discussion list ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'52fee32a1ec50eb0d0dab4dada87c497'), -('2017-08-21','2017-08-21 11:24:36','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,1474,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'e3a16ef77e2ee48767c499104f67270b'), -('2017-08-21','2017-08-21 11:24:36','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,1053,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c3a8d98433975fefb64f3c059d6046f0'), -('2017-08-21','2017-08-21 11:24:36','xent.com','evergo.net','127.0.0.0',1.19,0,3248,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','johnhall','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'162bc579fb3145dc3c65669328fa39cb'), -('2017-08-21','2017-08-21 11:24:36','xent.com','techmonkeys.net','127.0.0.0',0.69,0,2218,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','cdale','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'672fa037061f621085fbe997d236f374'), -('2017-08-21','2017-08-21 11:24:36','xent.com','','127.0.0.0',0.69,0,5136,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'3b86bc8189eba5d6ed9b633ce2995c6d'), -('2017-08-21','2017-08-21 11:24:36','xent.com','permafrost.net','127.0.0.0',0.69,0,3388,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','owen','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'03190fd537aa97e9be7d4a75fed57d36'), -('2017-08-21','2017-08-21 11:24:36','xent.com','slack.net','127.0.0.0',0.69,0,2554,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','tomwhore','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'2a1f34828b8a6a9750a1a09bc305983d'), -('2017-08-21','2017-08-21 11:24:36','xent.com','permafrost.net','127.0.0.0',0.69,0,4069,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','owen','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'9167f411217b18af953884010508dc2f'), -('2017-08-21','2017-08-21 11:24:36','xent.com','magnesium.net','127.0.0.0',0.69,0,2547,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','bitbitch','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'8d5d3caf91661a5b36f857a3010c4a48'), -('2017-08-21','2017-08-21 11:24:36','xent.com','canada.com','127.0.0.0',0.69,0,2806,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','garym','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'236f08f521364e701ad8dc43afde4fc4'), -('2017-08-21','2017-08-21 11:24:46','example.com','example.com','127.0.0.0',0.9,0,1639,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'a8f132bbb47ea2b4310e550d9617023f'), -('2017-08-21','2017-08-21 11:24:46','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,2890,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'c772a14916e765a4593939a5991bb859'), -('2017-08-21','2017-08-21 11:24:46','spamassassin.taint.org','spamassassin.taint.org','127.0.0.0',0.9,0,975,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'83cfbad1dbcb7234843ff01b810ea2c0'), -('2017-08-21','2017-08-21 11:24:46','xent.com','cse.ucsc.edu','127.0.0.0',0.69,0,3225,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','elias','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'9fa1aa06c0afe91f1aad86a128c475f6'), -('2017-08-21','2017-08-21 11:24:46','xent.com','hotmail.com','127.0.0.0',1.69,0,3376,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','fork-admin','deafbox','','','friends of rohit khare ',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'8d7f99415bb42f744c9d06ccf8d5ccbf') \ No newline at end of file +(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'), \ No newline at end of file diff --git a/test/functional/data/schema_2/schema.sql b/test/functional/data/schema_2/schema.sql index d1d00222d..a0df35a2b 100644 --- a/test/functional/data/schema_2/schema.sql +++ b/test/functional/data/schema_2/schema.sql @@ -21,6 +21,7 @@ CREATE TABLE rspamd RcptUser String, RcptDomain String, ListId String, + Subject String, `Attachments.FileName` Array(String), `Attachments.ContentType` Array(String), `Attachments.Length` Array(UInt32), @@ -39,4 +40,4 @@ CREATE TABLE rspamd CREATE TABLE rspamd_version ( Version UInt32) ENGINE = TinyLog; -INSERT INTO rspamd_version (Version) Values (2); \ No newline at end of file +INSERT INTO rspamd_version (Version) Values (3); \ No newline at end of file