From: Jeremy Harris Date: Fri, 13 Sep 2024 15:33:24 +0000 (+0100) Subject: Testsuite: tidying X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/c0187be12d11f99314a658b1db1263cfff6dec05?ds=inline Testsuite: tidying --- diff --git a/test/maint/cp_testcase b/test/maint/cp_testcase index e2d90f8a0..a97913357 100755 --- a/test/maint/cp_testcase +++ b/test/maint/cp_testcase @@ -18,7 +18,7 @@ set -x cp scripts/*/$srcnum $dstdir/$dstnum git add $dstdir/$dstnum -for d in confs log rejectlog paniclog stdin stderr +for d in confs log rejectlog paniclog stdout stderr do if [ -f "$d/$srcnum" ] then diff --git a/test/maint/mv_testcase b/test/maint/mv_testcase index e7b0dc3fe..54000812e 100755 --- a/test/maint/mv_testcase +++ b/test/maint/mv_testcase @@ -17,7 +17,7 @@ fi set -x git mv scripts/*/$srcnum $dstdir/$dstnum -for d in confs log rejectlog paniclog stdin stderr +for d in confs log rejectlog paniclog stdout stderr do [ -f "$d/$srcnum" ] && git mv "$d/$srcnum" "$d/$dstnum" done diff --git a/test/stdout/0177 b/test/stdout/0177 deleted file mode 100644 index 26fd516c5..000000000 --- a/test/stdout/0177 +++ /dev/null @@ -1,37 +0,0 @@ -TTT sss 10HmbA-000000005vi-0000 *** frozen *** - userx@test.ex - +D >usery:userx@test.ex - -TTT sss 10HmbG-000000005vi-0000 *** frozen *** - userz@test.ex - - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250 HELP -MAIL FROM: -250 Sender OK -RCPT TO: -250 Recipient OK -DATA -350 Send message -Received: from CALLER by the.local.host.name with local (Exim x.yz) - (envelope-from ) - id 10HmbG-000000005vi-0000 - for userz@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -Subject: freeze this (3) -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -This is a third message to be frozen. -. -250 OK -QUIT -250 OK -End of script diff --git a/test/stdout/0184 b/test/stdout/0184 deleted file mode 100644 index 7c70e0960..000000000 --- a/test/stdout/0184 +++ /dev/null @@ -1,202 +0,0 @@ -To: contains -000@test.ex, 001@test.ex, 002@test.ex, 003@test.ex, 004@test.ex, - 005@test.ex, 006@test.ex, 007@test.ex, 008@test.ex, 009@test.ex, - 010@test.ex, 011@test.ex, 012@test.ex, 013@test.ex, 014@test.ex, - 015@test.ex, 016@test.ex, 017@test.ex, 018@test.ex, 019@test.ex, - 020@test.ex, 021@test.ex, 022@test.ex, 023@test.ex, 024@test.ex, - 025@test.ex, 026@test.ex, 027@test.ex, 028@test.ex, 029@test.ex, - 030@test.ex, 031@test.ex, 032@test.ex, 033@test.ex, 034@test.ex, - 035@test.ex, 036@test.ex, 037@test.ex, 038@test.ex, 039@test.ex, - 040@test.ex, 041@test.ex, 042@test.ex, 043@test.ex, 044@test.ex, - 045@test.ex, 046@test.ex, 047@test.ex, 048@test.ex, 049@test.ex, - 050@test.ex, 051@test.ex, 052@test.ex, 053@test.ex, 054@test.ex, - 055@test.ex, 056@test.ex, 057@test.ex, 058@test.ex, 059@test.ex, - 060@test.ex, 061@test.ex, 062@test.ex, 063@test.ex, 064@test.ex, - 065@test.ex, 066@test.ex, 067@test.ex, 068@test.ex, 069@test.ex, - 070@test.ex, 071@test.ex, 072@test.ex, 073@test.ex, 074@test.ex, - 075@test.ex, 076@test.ex, 077@test.ex, 078@test.ex, 079@test.ex, - 080@test.ex, 081@test.ex, 082@test.ex, 083@test.ex, 084@test.ex, - 085@test.ex, 086@test.ex, 087@test.ex, 088@test.ex, 089@test.ex, - 090@test.ex, 091@test.ex, 092@test.ex, 093@test.ex, 094@test.ex, - 095@test.ex, 096@test.ex, 097@test.ex, 098@test.ex, 099@test.ex, - 100@test.ex, 101@test.ex, 102@test.ex, 103@test.ex, 104@test.ex, - 105@test.ex, 106@test.ex, 107@test.ex, 108@test.ex, 109@test.ex, - 110@test.ex, 111@test.ex, 112@test.ex, 113@test.ex, 114@test.ex, - 115@test.ex, 116@test.ex, 117@test.ex, 118@test.ex, 119@test.ex, - 120@test.ex, 121@test.ex, 122@test.ex, 123@test.ex, 124@test.ex, - 125@test.ex, 126@test.ex, 127@test.ex, 128@test.ex, 129@test.ex, - 130@test.ex, 131@test.ex, 132@test.ex, 133@test.ex, 134@test.ex, - 135@test.ex, 136@test.ex, 137@test.ex, 138@test.ex, 139@test.ex, - 140@test.ex, 141@test.ex, 142@test.ex, 143@test.ex, 144@test.ex, - 145@test.ex, 146@test.ex, 147@test.ex, 148@test.ex, 149@test.ex, - 150@test.ex, 151@test.ex, 152@test.ex, 153@test.ex, 154@test.ex, - 155@test.ex, 156@test.ex, 157@test.ex, 158@test.ex, 159@test.ex, - 160@test.ex, 161@test.ex, 162@test.ex, 163@test.ex, 164@test.ex, - 165@test.ex, 166@test.ex, 167@test.ex, 168@test.ex, 169@test.ex, - 170@test.ex, 171@test.ex, 172@test.ex, 173@test.ex, 174@test.ex, - 175@test.ex, 176@test.ex, 177@test.ex, 178@test.ex, 179@test.ex, - 180@test.ex, 181@test.ex, 182@test.ex, 183@test.ex, 184@test.ex, - 185@test.ex, 186@test.ex, 187@test.ex, 188@test.ex, 189@test.ex, - 190@test.ex, 191@test.ex, 192@test.ex, 193@test.ex, 194@test.ex, - 195@test.ex, 196@test.ex, 197@test.ex, 198@test.ex, 199@test.ex, - 200@test.ex, 201@test.ex, 202@test.ex, 203@test.ex, 204@test.ex, - 205@test.ex, 206@test.ex, 207@test.ex, 208@test.ex, 209@test.ex, - 210@test.ex, 211@test.ex, 212@test.ex, 213@test.ex, 214@test.ex, - 215@test.ex, 216@test.ex, 217@test.ex, 218@test.ex, 219@test.ex, - 220@test.ex, 221@test.ex, 222@test.ex, 223@test.ex, 224@test.ex, - 225@test.ex, 226@test.ex, 227@test.ex, 228@test.ex, 229@test.ex, - 230@test.ex, 231@test.ex, 232@test.ex, 233@test.ex, 234@test.ex, - 235@test.ex, 236@test.ex, 237@test.ex, 238@test.ex, 239@test.ex, - 240@test.ex, 241@test.ex, 242@test.ex, 243@test.ex, 244@test.ex, - 245@test.ex, 246@test.ex, 247@test.ex, 248@test.ex, 249@test.ex, - 250@test.ex, 251@test.ex, 252@test.ex, 253@test.ex, 254@test.ex, - 255@test.ex, 256@test.ex, 257@test.ex, 258@test.ex, 259@test.ex, - 260@test.ex, 261@test.ex, 262@test.ex, 263@test.ex, 264@test.ex, - 265@test.ex, 266@test.ex, 267@test.ex, 268@test.ex, 269@test.ex, - 270@test.ex, 271@test.ex, 272@test.ex, 273@test.ex, 274@test.ex, - 275@test.ex, 276@test.ex, 277@test.ex, 278@test.ex, 279@test.ex, - 280@test.ex, 281@test.ex, 282@test.ex, 283@test.ex, 284@test.ex, - 285@test.ex, 286@test.ex, 287@test.ex, 288@test.ex, 289@test.ex, - 290@test.ex, 291@test.ex, 292@test.ex, 293@test.ex, 294@test.ex, - 295@test.ex, 296@test.ex, 297@test.ex, 298@test.ex, 299@test.ex, - 300@test.ex, 301@test.ex, 302@test.ex, 303@test.ex, 304@test.ex, - 305@test.ex, 306@test.ex, 307@test.ex, 308@test.ex, 309@test.ex, - 310@test.ex, 311@test.ex, 312@test.ex, 313@test.ex, 314@test.ex, - 315@test.ex, 316@test.ex, 317@test.ex, 318@test.ex, 319@test.ex, - 320@test.ex, 321@test.ex, 322@test.ex, 323@test.ex, 324@test.ex, - 325@test.ex, 326@test.ex, 327@test.ex, 328@test.ex, 329@test.ex, - 330@test.ex, 331@test.ex, 332@test.ex, 333@test.ex, 334@test.ex, - 335@test.ex, 336@test.ex, 337@test.ex, 338@test.ex, 339@test.ex, - 340@test.ex, 341@test.ex, 342@test.ex, 343@test.ex, 344@test.ex, - 345@test.ex, 346@test.ex, 347@test.ex, 348@test.ex, 349@test.ex, - 350@test.ex, 351@test.ex, 352@test.ex, 353@test.ex, 354@test.ex, - 355@test.ex, 356@test.ex, 357@test.ex, 358@test.ex, 359@test.ex, - 360@test.ex, 361@test.ex, 362@test.ex, 363@test.ex, 364@test.ex, - 365@test.ex, 366@test.ex, 367@test.ex, 368@test.ex, 369@test.ex, - 370@test.ex, 371@test.ex, 372@test.ex, 373@test.ex, 374@test.ex, - 375@test.ex, 376@test.ex, 377@test.ex, 378@test.ex, 379@test.ex, - 380@test.ex, 381@test.ex, 382@test.ex, 383@test.ex, 384@test.ex, - 385@test.ex, 386@test.ex, 387@test.ex, 388@test.ex, 389@test.ex, - 390@test.ex, 391@test.ex, 392@test.ex, 393@test.ex, 394@test.ex, - 395@test.ex, 396@test.ex, 397@test.ex, 398@test.ex, 399@test.ex, - 400@test.ex, 401@test.ex, 402@test.ex, 403@test.ex, 404@test.ex, - 405@test.ex, 406@test.ex, 407@test.ex, 408@test.ex, 409@test.ex, - 410@test.ex, 411@test.ex, 412@test.ex, 413@test.ex, 414@test.ex, - 415@test.ex, 416@test.ex, 417@test.ex, 418@test.ex, 419@test.ex, - 420@test.ex, 421@test.ex, 422@test.ex, 423@test.ex, 424@test.ex, - 425@test.ex, 426@test.ex, 427@test.ex, 428@test.ex, 429@test.ex, - 430@test.ex, 431@test.ex, 432@test.ex, 433@test.ex, 434@test.ex, - 435@test.ex, 436@test.ex, 437@test.ex, 438@test.ex, 439@test.ex, - 440@test.ex, 441@test.ex, 442@test.ex, 443@test.ex, 444@test.ex, - 445@test.ex, 446@test.ex, 447@test.ex, 448@test.ex, 449@test.ex, - 450@test.ex, 451@test.ex, 452@test.ex, 453@test.ex, 454@test.ex, - 455@test.ex, 456@test.ex, 457@test.ex, 458@test.ex, 459@test.ex, - 460@test.ex, 461@test.ex, 462@test.ex, 463@test.ex, 464@test.ex, - 465@test.ex, 466@test.ex, 467@test.ex, 468@test.ex, 469@test.ex, - 470@test.ex, 471@test.ex, 472@test.ex, 473@test.ex, 474@test.ex, - 475@test.ex, 476@test.ex, 477@test.ex, 478@test.ex, 479@test.ex, - 480@test.ex, 481@test.ex, 482@test.ex, 483@test.ex, 484@test.ex, - 485@test.ex, 486@test.ex, 487@test.ex, 488@test.ex, 489@test.ex, - 490@test.ex, 491@test.ex, 492@test.ex, 493@test.ex, 494@test.ex, - 495@test.ex, 496@test.ex, 497@test.ex, 498@test.ex, 499@test.ex, - 500@test.ex, 501@test.ex, 502@test.ex, 503@test.ex, 504@test.ex, - 505@test.ex, 506@test.ex, 507@test.ex, 508@test.ex, 509@test.ex, - 510@test.ex, 511@test.ex, 512@test.ex, 513@test.ex, 514@test.ex, - 515@test.ex, 516@test.ex, 517@test.ex, 518@test.ex, 519@test.ex, - 520@test.ex, 521@test.ex, 522@test.ex, 523@test.ex, 524@test.ex, - 525@test.ex, 526@test.ex, 527@test.ex, 528@test.ex, 529@test.ex, - 530@test.ex, 531@test.ex, 532@test.ex, 533@test.ex, 534@test.ex, - 535@test.ex, 536@test.ex, 537@test.ex, 538@test.ex, 539@test.ex, - 540@test.ex, 541@test.ex, 542@test.ex, 543@test.ex, 544@test.ex, - 545@test.ex, 546@test.ex, 547@test.ex, 548@test.ex, 549@test.ex, - 550@test.ex, 551@test.ex, 552@test.ex, 553@test.ex, 554@test.ex, - 555@test.ex, 556@test.ex, 557@test.ex, 558@test.ex, 559@test.ex, - 560@test.ex, 561@test.ex, 562@test.ex, 563@test.ex, 564@test.ex, - 565@test.ex, 566@test.ex, 567@test.ex, 568@test.ex, 569@test.ex, - 570@test.ex, 571@test.ex, 572@test.ex, 573@test.ex, 574@test.ex, - 575@test.ex, 576@test.ex, 577@test.ex, 578@test.ex, 579@test.ex, - 580@test.ex, 581@test.ex, 582@test.ex, 583@test.ex, 584@test.ex, - 585@test.ex, 586@test.ex, 587@test.ex, 588@test.ex, 589@test.ex, - 590@test.ex, 591@test.ex, 592@test.ex, 593@test.ex, 594@test.ex, - 595@test.ex, 596@test.ex, 597@test.ex, 598@test.ex, 599@test.ex, - 600@test.ex, 601@test.ex, 602@test.ex, 603@test.ex, 604@test.ex, - 605@test.ex, 606@test.ex, 607@test.ex, 608@test.ex, 609@test.ex, - 610@test.ex, 611@test.ex, 612@test.ex, 613@test.ex, 614@test.ex, - 615@test.ex, 616@test.ex, 617@test.ex, 618@test.ex, 619@test.ex, - 620@test.ex, 621@test.ex, 622@test.ex, 623@test.ex, 624@test.ex, - 625@test.ex, 626@test.ex, 627@test.ex, 628@test.ex, 629@test.ex, - 630@test.ex, 631@test.ex, 632@test.ex, 633@test.ex, 634@test.ex, - 635@test.ex, 636@test.ex, 637@test.ex, 638@test.ex, 639@test.ex, - 640@test.ex, 641@test.ex, 642@test.ex, 643@test.ex, 644@test.ex, - 645@test.ex, 646@test.ex, 647@test.ex, 648@test.ex, 649@test.ex, - 650@test.ex, 651@test.ex, 652@test.ex, 653@test.ex, 654@test.ex, - 655@test.ex, 656@test.ex, 657@test.ex, 658@test.ex, 659@test.ex, - 660@test.ex, 661@test.ex, 662@test.ex, 663@test.ex, 664@test.ex, - 665@test.ex, 666@test.ex, 667@test.ex, 668@test.ex, 669@test.ex, - 670@test.ex, 671@test.ex, 672@test.ex, 673@test.ex, 674@test.ex, - 675@test.ex, 676@test.ex, 677@test.ex, 678@test.ex, 679@test.ex, - 680@test.ex, 681@test.ex, 682@test.ex, 683@test.ex, 684@test.ex, - 685@test.ex, 686@test.ex, 687@test.ex, 688@test.ex, 689@test.ex, - 690@test.ex, 691@test.ex, 692@test.ex, 693@test.ex, 694@test.ex, - 695@test.ex, 696@test.ex, 697@test.ex, 698@test.ex, 699@test.ex, - 700@test.ex, 701@test.ex, 702@test.ex, 703@test.ex, 704@test.ex, - 705@test.ex, 706@test.ex, 707@test.ex, 708@test.ex, 709@test.ex, - 710@test.ex, 711@test.ex, 712@test.ex, 713@test.ex, 714@test.ex, - 715@test.ex, 716@test.ex, 717@test.ex, 718@test.ex, 719@test.ex, - 720@test.ex, 721@test.ex, 722@test.ex, 723@test.ex, 724@test.ex, - 725@test.ex, 726@test.ex, 727@test.ex, 728@test.ex, 729@test.ex, - 730@test.ex, 731@test.ex, 732@test.ex, 733@test.ex, 734@test.ex, - 735@test.ex, 736@test.ex, 737@test.ex, 738@test.ex, 739@test.ex, - 740@test.ex, 741@test.ex, 742@test.ex, 743@test.ex, 744@test.ex, - 745@test.ex, 746@test.ex, 747@test.ex, 748@test.ex, 749@test.ex, - 750@test.ex, 751@test.ex, 752@test.ex, 753@test.ex, 754@test.ex, - 755@test.ex, 756@test.ex, 757@test.ex, 758@test.ex, 759@test.ex, - 760@test.ex, 761@test.ex, 762@test.ex, 763@test.ex, 764@test.ex, - 765@test.ex, 766@test.ex, 767@test.ex, 768@test.ex, 769@test.ex, - 770@test.ex, 771@test.ex, 772@test.ex, 773@test.ex, 774@test.ex, - 775@test.ex, 776@test.ex, 777@test.ex, 778@test.ex, 779@test.ex, - 780@test.ex, 781@test.ex, 782@test.ex, 783@test.ex, 784@test.ex, - 785@test.ex, 786@test.ex, 787@test.ex, 788@test.ex, 789@test.ex, - 790@test.ex, 791@test.ex, 792@test.ex, 793@test.ex, 794@test.ex, - 795@test.ex, 796@test.ex, 797@test.ex, 798@test.ex, 799@test.ex, - 800@test.ex, 801@test.ex, 802@test.ex, 803@test.ex, 804@test.ex, - 805@test.ex, 806@test.ex, 807@test.ex, 808@test.ex, 809@test.ex, - 810@test.ex, 811@test.ex, 812@test.ex, 813@test.ex, 814@test.ex, - 815@test.ex, 816@test.ex, 817@test.ex, 818@test.ex, 819@test.ex, - 820@test.ex, 821@test.ex, 822@test.ex, 823@test.ex, 824@test.ex, - 825@test.ex, 826@test.ex, 827@test.ex, 828@test.ex, 829@test.ex, - 830@test.ex, 831@test.ex, 832@test.ex, 833@test.ex, 834@test.ex, - 835@test.ex, 836@test.ex, 837@test.ex, 838@test.ex, 839@test.ex, - 840@test.ex, 841@test.ex, 842@test.ex, 843@test.ex, 844@test.ex, - 845@test.ex, 846@test.ex, 847@test.ex, 848@test.ex, 849@test.ex, - 850@test.ex, 851@test.ex, 852@test.ex, 853@test.ex, 854@test.ex, - 855@test.ex, 856@test.ex, 857@test.ex, 858@test.ex, 859@test.ex, - 860@test.ex, 861@test.ex, 862@test.ex, 863@test.ex, 864@test.ex, - 865@test.ex, 866@test.ex, 867@test.ex, 868@test.ex, 869@test.ex, - 870@test.ex, 871@test.ex, 872@test.ex, 873@test.ex, 874@test.ex, - 875@test.ex, 876@test.ex, 877@test.ex, 878@test.ex, 879@test.ex, - 880@test.ex, 881@test.ex, 882@test.ex, 883@test.ex, 884@test.ex, - 885@test.ex, 886@test.ex, 887@test.ex, 888@test.ex, 889@test.ex, - 890@test.ex, 891@test.ex, 892@test.ex, 893@test.ex, 894@test.ex, - 895@test.ex, 896@test.ex, 897@test.ex, 898@test.ex, 899@test.ex, - 900@test.ex, 901@test.ex, 902@test.ex, 903@test.ex, 904@test.ex, - 905@test.ex, 906@test.ex, 907@test.ex, 908@test.ex, 909@test.ex, - 910@test.ex, 911@test.ex, 912@test.ex, 913@test.ex, 914@test.ex, - 915@test.ex, 916@test.ex, 917@test.ex, 918@test.ex, 919@test.ex, - 920@test.ex, 921@test.ex, 922@test.ex, 923@test.ex, 924@test.ex, - 925@test.ex, 926@test.ex, 927@test.ex, 928@test.ex, 929@test.ex, - 930@test.ex, 931@test.ex, 932@test.ex, 933@test.ex, 934@test.ex, - 935@test.ex, 936@test.ex, 937@test.ex, 938@test.ex, 939@test.ex, - 940@test.ex, 941@test.ex, 942@test.ex, 943@test.ex, 944@test.ex, - 945@test.ex, 946@test.ex, 947@test.ex, 948@test.ex, 949@test.ex, - 950@test.ex, 951@test.ex, 952@test.ex, 953@test.ex, 954@test.ex, - 955@test.ex, 956@test.ex, 957@test.ex, 958@test.ex, 959@test.ex, - 960@test.ex, 961@test.ex, 962@test.ex, 963@test.ex, 964@test.ex, - 965@test.ex, 966@test.ex, 967@test.ex, 968@test.ex, 969@test.ex, - 970@test.ex, 971@test.ex, 972@test.ex, 973@test.ex, 974@test.ex, - 975@test.ex, 976@test.ex, 977@test.ex, 978@test.ex, 979@test.ex, - 980@test.ex, 981@test.ex, 982@test.ex, 983@test.ex, 984@test.ex, - 985@test.ex, 986@test.ex, 987@test.ex, 988@test.ex, 989@test.ex, - 990@test.ex, 991@test.ex, 992@test.ex, 993@test.ex, 994@test.ex, - 995@test.ex, 996@test.ex, 997@test.ex, 998@test.ex, 999@test.ex -nnnnnn diff --git a/test/stdout/0185 b/test/stdout/0185 deleted file mode 100644 index 68425b415..000000000 --- a/test/stdout/0185 +++ /dev/null @@ -1,33 +0,0 @@ -TTT sss 10HmaX-000000005vi-0000 *** frozen *** - usery@test.ex - - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250 HELP -MAIL FROM: -250 Sender OK -RCPT TO: -250 Recipient OK -DATA -350 Send message -Received: from CALLER by the.local.host.name with local (Exim x.yz) - (envelope-from ) - id 10HmaX-000000005vi-0000 - for usery@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -Subject: freeze this -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -This is a message to be frozen. -. -250 OK -QUIT -250 OK -End of script diff --git a/test/stdout/0232 b/test/stdout/0232 deleted file mode 100644 index 55a07933b..000000000 --- a/test/stdout/0232 +++ /dev/null @@ -1,6 +0,0 @@ -prefix-filter1.test.ex@myhost.test.ex - <-- filter1.test.ex@myhost.test.ex - router = rest, transport = local_delivery -postmaster@myhost.test.ex - <-- filter1.test.ex@myhost.test.ex - router = rest, transport = local_delivery diff --git a/test/stdout/0233 b/test/stdout/0233 deleted file mode 100644 index 97fdce807..000000000 --- a/test/stdout/0233 +++ /dev/null @@ -1,16 +0,0 @@ -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250 myhost.test.ex Hello CALLER at test -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmbA-000000005vi-0000 -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmbB-000000005vi-0000 -250 OK -250 Accepted -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmbD-000000005vi-0000 -221 myhost.test.ex closing connection diff --git a/test/stdout/0241 b/test/stdout/0241 deleted file mode 100644 index 4bd6a5344..000000000 --- a/test/stdout/0241 +++ /dev/null @@ -1 +0,0 @@ -Message 10HmaX-000000005vi-0000 is no longer frozen diff --git a/test/stdout/0297 b/test/stdout/0297 deleted file mode 100644 index d6947af8c..000000000 --- a/test/stdout/0297 +++ /dev/null @@ -1,8 +0,0 @@ -/a/b/c@myhost.test.ex -> /a/b/c - transport = tf1 -/x/y/z@myhost.test.ex -> /x/y/z - transport = tf2 -/a/b/c/@myhost.test.ex -> /a/b/c/ - transport = td1 -/a/a/b//@myhost.test.ex -> /a/a/b// - transport = td2 diff --git a/test/stdout/0316 b/test/stdout/0316 deleted file mode 100644 index e26b82a1f..000000000 --- a/test/stdout/0316 +++ /dev/null @@ -1,12 +0,0 @@ -Warning: no message headers read -Return-path copied from sender -Sender = CALLER@test.ex -Recipient = CALLER@test.ex -Testing Exim filter file "TESTSUITE/aux-fixed/0316.f-user" - -Testprint: 1 Matched c@d -Testprint: 2 Matched c@d -Testprint: 3 Matched cc@dd -Testprint: 4 Matched e@f -Filtering did not set up a significant delivery. -Normal delivery will occur. diff --git a/test/stdout/0372 b/test/stdout/0372 deleted file mode 100644 index 76372708e..000000000 --- a/test/stdout/0372 +++ /dev/null @@ -1,38 +0,0 @@ -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250 myhost.test.ex Hello CALLER at host.name [1.2.3.4] -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaY-000000005vi-0000 -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaZ-000000005vi-0000 -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250 myhost.test.ex Hello CALLER at host2.name [4.3.2.1] -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaX-000000005vi-0000 -221 myhost.test.ex closing connection -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> HELO test -??? 250 -<<< 250 myhost.test.ex Hello localhost [127.0.0.1] ->>> MAIL FROM:<> -??? 250 -<<< 250 OK ->>> RCPT TO: -??? 250 -<<< 250 Accepted ->>> DATA -??? 354 -<<< 354 Enter message, ending with "." on a line by itself ->>> . -??? 250 -<<< 250 OK id=10HmbA-000000005vi-0000 ->>> QUIT -End of script diff --git a/test/stdout/0378 b/test/stdout/0378 deleted file mode 100644 index 988556e1e..000000000 --- a/test/stdout/0378 +++ /dev/null @@ -1,29 +0,0 @@ -10HmaX-000000005vi-0000-H -CALLER UID GID - -ddddddddd 0 --received_time_usec .uuuuuu --received_time_complete tttt.uuuuuu --ident CALLER --received_protocol local --body_linecount 0 --max_received_linelength 0 --auth_id CALLER --auth_sender CALLER@myhost.test.ex --allow_unqualified_recipient --allow_unqualified_sender --local -YY >CALLER@myhost.test.ex:aaaa@myhost.test.ex -NN TESTSUITE/test-mail/file:aaaa@myhost.test.ex -NN |/bin/sh -c exit:aaaa@myhost.test.ex -1 -aaaa@myhost.test.ex - -dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-000000005vi-0000 - for aaaa@myhost.test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -054I Message-Id: -dddF From: CALLER_NAME -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0406 b/test/stdout/0406 deleted file mode 100644 index 51ebd51cb..000000000 --- a/test/stdout/0406 +++ /dev/null @@ -1,71 +0,0 @@ -Return-path copied from sender -Sender = CALLER@test.ex -Recipient = CALLER@test.ex -Testing Exim filter file "TESTSUITE/aux-fixed/0406.f" - -Testprint: subject = >lots of leading and trailing space< -Testprint: raw subject = > lots of leading and trailing space \n< -Testprint: to = >a@b,\nc@d< -Testprint: raw to = > a@b \n c@d \n< -Testprint: rX-1: > (=?ISO-8859-1?Q?a?=)\n< -Testprint: bX-1: >(a)< -Testprint: X-1: >(a)< -Testprint: rX-2: > (=?ISO-8859-1?Q?a?= b)\n< -Testprint: bX-2: >(a b)< -Testprint: X-2: >(a b)< -Testprint: rX-3: > (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)\n< -Testprint: bX-3: >(ab)< -Testprint: X-3: >(ab)< -Testprint: rX-4: > (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)\n< -Testprint: bX-4: >(ab)< -Testprint: X-4: >(ab)< -Testprint: rX-5: > (=?ISO-8859-1?Q?a?= \n =?ISO-8859-1?Q?b?=)\n< -Testprint: bX-5: >(ab)< -Testprint: X-5: >(ab)< -Testprint: rX-6: > (=?ISO-8859-1?Q?a_b?=)\n< -Testprint: bX-6: >(a b)< -Testprint: X-6: >(a b)< -Testprint: rX-7: > (=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)\n< -Testprint: bX-7: >(a b)< -Testprint: X-7: >(a b)< -Testprint: rX-8: > (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)\n< -Testprint: bX-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)< -Testprint: X-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)< -Testprint: rX-9: > =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= \n< -Testprint: bX-9: >Patrik F\344ltstr\366m < -Testprint: X-9: >Patrik F\344ltstr\366m < -Testprint: rX-10: > =?US-ASCII?Q?Keith_Moore?= \n< -Testprint: bX-10: >Keith Moore < -Testprint: X-10: >Keith Moore < -Testprint: rX-11: > =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= \n< -Testprint: bX-11: >Keld J\370rn Simonsen < -Testprint: X-11: >Keld J\370rn Simonsen < -Testprint: rX-12: > =?ISO-8859-1?Q?Andr=E9?= Pirard \n< -Testprint: bX-12: >Andr\351 Pirard < -Testprint: X-12: >Andr\351 Pirard < -Testprint: rX-13: > =?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?=\n =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=\n< -Testprint: bX-13: >If you can read this you understand the example.< -Testprint: X-13: >If you can read this you understand the example.< -Testprint: rX-14: > =?ISO-8859-1?Q?X=00Y?= \n< -Testprint: bX-14: >X?Y< -Testprint: X-14: >X?Y< -Testprint: rX-15: > =?iso-8859-3?Q?=?= =?US-ASCII?Q?ABCD?= Text\n< -Testprint: bX-15: >=?iso-8859-3?Q?=?= ABCD Text< -Testprint: X-15: >=?iso-8859-3?Q?=?= ABCD Text< -Testprint: rX-16: > =?iso-8859-3?B?+2?= =?UTF-8?Q?ABCD?= Text\n< -Testprint: bX-16: >=?iso-8859-3?B?+2?= ABCD Text< -Testprint: X-16: >=?iso-8859-3?B?+2?= ABCD Text< -Testprint: rX-17: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n< -Testprint: bX-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx< -Testprint: X-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx< -Testprint: rX-18: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n< -Testprint: bX-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=< -Testprint: X-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=< -Testprint: rX-19: > =?iso-8859-3?B?=?= =?UTF-8?Q?ABCD?= Text\n< -Testprint: bX-19: >=?iso-8859-3?B?=?= ABCD Text< -Testprint: X-19: >=?iso-8859-3?B?=?= ABCD Text< -Testprint: rX-20: > =?iso-8859-1?Q?a?= =?ISO-8859-1?Q?x y?= bad because of space\n< -Testprint: bX-20: >a =?ISO-8859-1?Q?x y?= bad because of space< -Testprint: X-20: >a =?ISO-8859-1?Q?x y?= bad because of space< -Filtering did not set up a significant delivery. -Normal delivery will occur. diff --git a/test/stdout/0454 b/test/stdout/0454 deleted file mode 100644 index f1106d184..000000000 --- a/test/stdout/0454 +++ /dev/null @@ -1,23 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> helo rhu.barb -??? 250 -<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1] ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-000000005vi-0000 ->>> QUIT -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/0510 b/test/stdout/0510 deleted file mode 100644 index 72eebab51..000000000 --- a/test/stdout/0510 +++ /dev/null @@ -1,24 +0,0 @@ -Return-path copied from sender -Sender = sen@d.e.r -Recipient = CALLER@myhost.test.ex -Testing Exim filter file "TESTSUITE/aux-fixed/0510.sfilter" - -Testprint: --------System filter--------- -Testprint: Sender: sen@d.e.r -Testprint: Subject: test 1 -Testprint: Body: Body content. -Headers add "X-Header: Added in a system filter" -Add 3 to n1 -Testprint: n1: 3 -Filtering did not set up a significant delivery. -Normal delivery will occur. -Testing Exim filter file "TESTSUITE/aux-fixed/0510.ufilter" - -Testprint: --------User filter--------- -Testprint: Sender: sen@d.e.r -Testprint: Subject: test 1 -Testprint: Body: Body content. -Testprint: X-Header: Added in a system filter -Testprint: sn1: 3 -Filtering did not set up a significant delivery. -Normal delivery will occur. diff --git a/test/stdout/0616 b/test/stdout/0616 deleted file mode 100644 index f18163d4f..000000000 --- a/test/stdout/0616 +++ /dev/null @@ -1,31 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250 HELP -MAIL FROM: -250 OK -RCPT TO: -250 OK -RCPT TO: -550 Not that one -DATA -354 More... -Received: from CALLER by the.local.host.name with local (Exim x.yz) - (envelope-from ) - id 10HmaX-000000005vi-0000 - for userx@domain1; - Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -This message will also be delivered to usery -. -250 OK -QUIT -220 OK -End of script diff --git a/test/stdout/0617 b/test/stdout/0617 deleted file mode 100644 index f18163d4f..000000000 --- a/test/stdout/0617 +++ /dev/null @@ -1,31 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250 HELP -MAIL FROM: -250 OK -RCPT TO: -250 OK -RCPT TO: -550 Not that one -DATA -354 More... -Received: from CALLER by the.local.host.name with local (Exim x.yz) - (envelope-from ) - id 10HmaX-000000005vi-0000 - for userx@domain1; - Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -This message will also be delivered to usery -. -250 OK -QUIT -220 OK -End of script diff --git a/test/stdout/0903 b/test/stdout/0903 deleted file mode 100644 index a7bda45dc..000000000 --- a/test/stdout/0903 +++ /dev/null @@ -1,7 +0,0 @@ -# Exim Configuration (X) -# 1 "TESTSUITE/test-config" -# 1 "TESTSUITE/test-config" -# 1 "TESTSUITE/confs/0903./aaa" -# 1 "TESTSUITE/confs/0903./aaa" -# 1 "TESTSUITE/confs/0903./aaa" -# 1 "TESTSUITE/test-config" diff --git a/test/stdout/3650 b/test/stdout/3650 deleted file mode 100644 index 87f70de47..000000000 --- a/test/stdout/3650 +++ /dev/null @@ -1,21 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO xxxx -??? 250- -<<< 250-myhost.test.ex Hello xxxx [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250 -<<< 250 HELP ->>> AUTH PLAIN AHVzZXJ4AHNlY3JldA== -??? 535 -<<< 535 Incorrect authentication data ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/4190 b/test/stdout/4190 new file mode 100644 index 000000000..7e70360e3 --- /dev/null +++ b/test/stdout/4190 @@ -0,0 +1,458 @@ +========== +# Sieve filter +if address ["From","To"] "marian@abcdefgh.example" + { discard; } +========== +No implicit keep +========== +# Sieve filter +if address :is "From" "marian@abcdefgh.example" + { discard; } +========== +Implicit keep +========== +# Sieve filter +if address :is "To" "marian@abcdefgh.example" + { discard; } +========== +No implicit keep +========== +# Sieve filter +if address :contains "To" "abcdefgh" + { discard; } +========== +No implicit keep +========== +# Sieve filter +if address :matches "To" "*abc?efgh*" + { discard; } +========== +No implicit keep +========== +# Sieve filter +if true { discard; } +========== +No implicit keep +========== +# Sieve filter +if false { discard; } +========== +Implicit keep +========== +# Sieve filter +if allof (false,false) { discard; } +========== +Implicit keep +========== +# Sieve filter +if allof (true,false) { discard; } +========== +Implicit keep +========== +# Sieve filter +if allof (false,true) { discard; } +========== +Implicit keep +========== +# Sieve filter +if allof (true,true) { discard; } +========== +No implicit keep +========== +# Sieve filter +if anyof (false,false) { discard; } +========== +Implicit keep +========== +# Sieve filter +if anyof (true,false) { discard; } +========== +No implicit keep +========== +# Sieve filter +if anyof (false,true) { discard; } +========== +No implicit keep +========== +# Sieve filter +if anyof (true,true) { discard; } +========== +No implicit keep +========== +# Sieve filter +if not anyof (false,false) { discard; } +========== +No implicit keep +========== +# Sieve filter +if not anyof (true,false) { discard; } +========== +Implicit keep +========== +# Sieve filter +if not anyof (false,true) { discard; } +========== +Implicit keep +========== +# Sieve filter +if not anyof (true,true) { discard; } +========== +Implicit keep +========== +# Sieve filter +if header "to" "MARIAN@abcdefgh.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :comparator "i;octet" "to" "MARIAN@abcdefgh.example" { discard; } +========== +Implicit keep +========== +# Sieve filter +if header :comparator "i;ascii-casemap" "to" "MARIAN@abcdefgh.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +require "envelope"; +if envelope "from" "marian@somenet.example" { discard; } +========== +Implicit keep +========== +# Sieve filter +require "envelope"; +if envelope "from" "offerqn@bpk.example.com" { discard; } +========== +No implicit keep +========== +# Sieve filter +if exists [ "X-NotHere", "X-Notheretoo" ] { discard; } +========== +Implicit keep +========== +# Sieve filter +if exists [ "X-NotHere", "Delivered-To" ] { discard; } +========== +Implicit keep +========== +# Sieve filter +if exists [ "From", "Delivered-To" ] { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :contains "X-NotHere" "" { discard; } +========== +Implicit keep +========== +# Sieve filter +if header "Delivered-To" "" { discard; } +========== +Implicit keep +========== +# Sieve filter +if header :contains "Delivered-To" "" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :contains "Delivered-To" "rc@irc.somenet.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "Delivered-To" ["irc@irc.somenet.example"] { discard; } +========== +Implicit keep +========== +# Sieve filter +if header "Delivered-To" ["irc@irc.somenet.example","irc@01019somenet.example","some.one"] { discard; } +========== +Implicit keep +========== +# Sieve filter +if header "Mime-Version" "1.0" { discard; } +========== +No implicit keep +========== +# Sieve filter +if false { discard; } +========== +Implicit keep +========== +# Sieve filter +if true { discard; } +========== +No implicit keep +========== +# Sieve filter +if true { discard; } else { keep; } +========== +No implicit keep +========== +# Sieve filter +if false { keep; } else { discard; } +========== +No implicit keep +========== +# Sieve filter +if false { keep; } elsif true { discard; } else { keep; } +========== +No implicit keep +========== +# Sieve filter +if true { discard; } elsif true { keep; } else { keep; } +========== +No implicit keep +========== +# Sieve filter +if false { keep; } + else + { if true { discard; } else { keep; } } +========== +No implicit keep +========== +# Sieve filter +if header :matches "to" "MA*AN@abc*fg?.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if not header :matches "to" "MA?AN@abc*fg?.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :matches "to" "*marian@abcdefgh.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if not header :matches "to" "?marian@abcdefgh.example" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :matches "to" "marian@abcdefgh.example*" { discard; } +========== +No implicit keep +========== +# Sieve filter +if not header :matches "to" "marian@abcdefgh.example?" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :matches "x-special1" "\\?*\\*" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header :matches "x-special1" "*\0*" { discard; } +========== +Implicit keep +========== +# Sieve filter +if not header :matches "x-special1" "*\0*q" { discard; } +========== +No implicit keep +========== +# Sieve filter +require "encoded-character"; +if not header :matches "x-special1" "*${hex:00}*" { discard; } +========== +Implicit keep +========== +# Sieve filter +if not header :matches "x-special2" "\\?*\\*" { discard; } +========== +No implicit keep +========== +# Sieve filter +if not header :matches "x-special2" "*\0*" { discard; } +========== +No implicit keep +========== +# Sieve filter +if size :over 400 { + discard; + } +========== +No implicit keep +========== +# Sieve filter +if size :over 4K { + discard; + } +========== +Implicit keep +========== +# Sieve filter +if size :under 4K { discard; } +========== +No implicit keep +========== +# Sieve filter +if size :under 400 { discard; } +========== +Implicit keep +========== +# Sieve filter +if false { keep; } +========== +Implicit keep +========== +# no filter line here +if unknowntest { keep; } +========== +Testing forward file file "test-data" + +exim: error in forward file: missing or malformed local part (expected word or "<") in "if unknowntest { keep; }" +========== +# Sieve filter +if test keep; } +========== +Sieve error: missing test in line 2 +========== +# Sieve filter +if test { keep; +========== +Sieve error: missing test in line 2 +========== +# Sieve filter +if true { unknownaction; } +========== +Sieve error: expecting command or closing brace in line 2 +========== +# Sieve filter +if true { fileinto abcdefgh; } +========== +Sieve error: missing previous require "fileinto"; in line 2 +========== +# Sieve filter +require "fileinto"; +if true { fileinto "abcdefgh"; } +========== +No implicit keep +========== +# Sieve filter +if header ["to"] [ "marian@abcdefgh.example", "achnee"] { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "to" [ "egal", "achnee" { keep; } +========== +Sieve error: missing string list in line 2 +========== +# Sieve filter +if header "to","from"] "egal" { keep; } +========== +Sieve error: key string list expected in line 2 +========== +# Sieve filter +if header ["to","from" "egal" { keep; } +========== +Sieve error: missing string list in line 2 +========== +# Sieve filter +if header ["to",,"from"] "egal" { keep; } +========== +Sieve error: missing string list in line 2 +========== +# Sieve filter +if header ["to",] "egal" { keep; } +========== +Sieve error: missing string list in line 2 +========== +# Sieve filter +if header [,"to"] "egal" { keep; } +========== +Sieve error: missing string list in line 2 +========== +# Sieve filter +if unknowntest { keep; } +========== +Sieve error: missing test in line 2 +========== +# Sieve filter +if header :matches "to" "egal" { keep; } +========== +Implicit keep +========== +# Sieve filter +if header :unknown "to" "egal" { keep; } +========== +Sieve error: header string list expected in line 2 +========== +# Sieve filter +# +require ["fileinto", "envelope"]; + +if header :matches "X-Warning" "* is listed at list.dsbl.org*" + { + keep; # keep in "In" folder + } +========== +No implicit keep +========== +# Sieve filter +if header "x-1" "1" { discard; } +========== +No implicit keep +========== +# Sieve filter +if not header "x-1" "=?ISO-8859-1?Q?=31?=" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-1b" "=?ISO-8859-1?Q?=31=" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-b64" "This is BASE64" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-b64-broken" "=?iso-8859-1?b?VGhpcyBpcyBCQVNFNjQ?=" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-q75total" "0123456789012345678901234567890123456789012345678901234567" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-q76total" "=?ISO-8859-1?Q?01234567890123456789012345678901234567890123456789012345678?=" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "X-Wrapped" "eins zwei drei" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-nomimewrap" "=?iso-8859-1?q?abc def ghi?=" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "subject" "abcdefghi" { discard; } +========== +No implicit keep +========== +# Sieve filter +if header "x-mixed" "abc def" { discard; } +========== +No implicit keep +========== +#Sieve filter +if true { stop; fileinto "inbox.never"; } +========== +Implicit keep diff --git a/test/stdout/4193 b/test/stdout/4193 new file mode 100644 index 000000000..8a9ae2366 --- /dev/null +++ b/test/stdout/4193 @@ -0,0 +1,80 @@ +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> HELO tester +??? 250 +<<< 250 myhost.test.ex Hello tester [127.0.0.1] +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> From: +>>> Subject: this should be accepted and filed +>>> +>>> a single body line +>>> . +??? 250 +<<< 250 OK id=10HmaX-000000005vi-0000 +>>> RSET +??? 250 +<<< 250 Reset OK ++++ 1 +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> From: +>>> Subject: this should be discarded by the filter +>>> . +??? 250 +<<< 250 OK id=10HmaY-000000005vi-0000 +>>> RSET +??? 250 +<<< 250 Reset OK ++++ 1 +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> From: +>>> Subject: this should be delivered to a speicifc place by the filter +>>> . +??? 250 +<<< 250 OK id=10HmaZ-000000005vi-0000 +>>> RSET +??? 250 +<<< 250 Reset OK ++++ 1 +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> From: +>>> Subject: this should be redirected by the filter to a different address +>>> . +??? 250 +<<< 250 OK id=10HmbA-000000005vi-0000 +>>> QUIT +??? 221 +<<< 221 myhost.test.ex closing connection +End of script diff --git a/test/stdout/5201 b/test/stdout/5201 deleted file mode 100644 index 0e3e5a0ac..000000000 --- a/test/stdout/5201 +++ /dev/null @@ -1 +0,0 @@ -Message 10HmaX-000000005vi-0000 is now frozen