Browse Source

[Test] Fighting with windmills in robot

tags/2.7
Vsevolod Stakhov 3 years ago
parent
commit
d8a0164440

+ 13
- 6
src/libserver/composites.c View File





if (!found) { if (!found) {
msg_debug_composites ("symbol %s in composite %s misses required option %s",
sym,
cd->composite->sym,
(cur_opt->type == RSPAMD_COMPOSITE_OPTION_PLAIN ?
cur_opt->data.match :
rspamd_regexp_get_pattern (cur_opt->data.re)));
if (cur_opt->type == RSPAMD_COMPOSITE_OPTION_PLAIN) {
msg_debug_composites ("symbol %s in composite %s misses required option %s",
sym,
cd->composite->sym,
cur_opt->data.match);
}
else {
msg_debug_composites ("symbol %s in composite %s failed to match regexp %s",
sym,
cd->composite->sym,
rspamd_regexp_get_pattern (cur_opt->data.re));
}

ms = NULL; ms = NULL;


break; break;

+ 10
- 1
test/functional/cases/109_composites.robot View File

Scan File ${MESSAGE} opts=sym1,foo1 Scan File ${MESSAGE} opts=sym1,foo1
Expect Symbol With Score SYMOPTS1 5.00 Expect Symbol With Score SYMOPTS1 5.00
Do Not Expect Symbol SYMOPTS2 Do Not Expect Symbol SYMOPTS2
Do Not Expect Symbol SYMOPTS3


Composites - Opts RE Miss both Composites - Opts RE Miss both
Scan File ${MESSAGE} opts=sym2 Scan File ${MESSAGE} opts=sym2
Do Not Expect Symbol SYMOPTS1 Do Not Expect Symbol SYMOPTS1
Do Not Expect Symbol SYMOPTS2 Do Not Expect Symbol SYMOPTS2
Do Not Expect Symbol SYMOPTS3


Composites - Opts RE Hit Composites - Opts RE Hit
Scan File ${MESSAGE} opts=sym2,foo1
Scan File ${MESSAGE} opts=foo1,sym2
Expect Symbol With Score SYMOPTS2 6.00 Expect Symbol With Score SYMOPTS2 6.00
Do Not Expect Symbol SYMOPTS1 Do Not Expect Symbol SYMOPTS1
Do Not Expect Symbol SYMOPTS3

Composites - Opts RE Hit 2
Scan File ${MESSAGE} opts=foo/,sym2
Expect Symbol With Score SYMOPTS3 6.00
Do Not Expect Symbol SYMOPTS2
Do Not Expect Symbol SYMOPTS1

+ 5
- 1
test/functional/configs/composites.conf View File

} }


SYMOPTS2 { SYMOPTS2 {
expression = "OPTS[/foo.*/,sym2]";
expression = 'OPTS[/foo[0-9]/,sym2]';
score = 6.0;
}
SYMOPTS3 {
expression = 'OPTS[sym2,/FoO\\//i]';
score = 6.0; score = 6.0;
} }
} }

Loading…
Cancel
Save