Commit 66ae8a92 66ae8a923930ba05df824bf58bbd766c7da3639b by Sergey Poznyakoff

Updated to match new test mailbox.

1 parent f79ab4e6
......@@ -20,79 +20,83 @@ mail_start "--file=%teaparty.mbox"
mail_command "set readonly"
mail_test "from 1,2,5-7 9" \
">N 1 March Hare Sun Jul 21 20:46 10/307 Invitation"\
" N 2 Alice Sun Jul 21 20:46 10/317 Re: Invitation"\
" N 5 March Hare Sun Jul 21 20:46 10/358 Re: Invitation"\
" N 6 Alice Sun Jul 21 20:46 11/373 Re: Invitation"\
" N 7 March Hare Sun Jul 21 20:46 10/321 Personal remark"\
" N 9 March Hare Sun Jul 21 20:46 10/350 Riddle (was Re: Personal "
">N 1 March Hare Mon Jul 29 22:00 10/301 Invitation"\
" N 2 Alice Mon Jul 29 22:00 10/311 Re: Invitation"\
" N 5 March Hare Mon Jul 29 22:00 10/352 Re: Invitation"\
" N 6 Alice Mon Jul 29 22:00 11/367 Re: Invitation"\
" N 7 March Hare Mon Jul 29 22:00 10/315 Personal remark"\
" N 9 March Hare Mon Jul 29 22:00 10/344 Riddle (was Re: Personal "
mail_test "from ^" \
">N 1 March Hare Sun Jul 21 20:46 10/307 Invitation"
">N 1 March Hare Mon Jul 29 22:00 10/301 Invitation"\
mail_test "from $" \
" N 95 Alice Sun Jul 21 20:46 11/385 Thoughts"
" N 95 Alice Mon Jul 29 22:01 11/379 Thoughts"
# FIXME: not yet functional
#mail_test "from hatter"
mail_test "tag from:/dormouse/"
mail_test "from :t" \
" T 17 Dormouse Sun Jul 21 20:46 12/448 Re: Be specific"\
" T 31 Dormouse Sun Jul 21 20:46 11/370 Re: Remark"\
" T 49 Dormouse Sun Jul 21 20:46 10/355 Re: Discussing Time"\
" T 61 Dormouse Sun Jul 21 20:46 11/388 Re: Request for a story"\
" T 65 Dormouse Sun Jul 21 20:46 12/477 Story (was Re: Request fo"\
" T 67 Dormouse Sun Jul 21 20:46 10/319 Re: Story"\
" T 69 Dormouse Sun Jul 21 20:46 10/321 Re: Story"\
" T 77 Dormouse Sun Jul 21 20:46 10/320 Re: Story"\
" T 79 Dormouse Sun Jul 21 20:46 11/364 Re: Story"\
" T 81 Dormouse Sun Jul 21 20:46 11/384 Re: Story"\
" T 83 Dormouse Sun Jul 21 20:46 10/306 Re: Story"\
" T 88 Dormouse Sun Jul 21 20:46 10/328 Re: Story"\
" T 89 Dormouse Sun Jul 21 20:46 11/396 Re: Story"\
" T 91 Dormouse Sun Jul 21 20:46 10/306 Re: Story"\
" T 92 Dormouse Sun Jul 21 20:46 13/493 Re: Story"
" T 17 Dormouse Mon Jul 29 22:00 12/442 Re: Be specific"\
" T 31 Dormouse Mon Jul 29 22:00 11/364 Re: Remark"\
" T 49 Dormouse Mon Jul 29 22:00 10/349 Re: Discussing Time"\
" T 61 Dormouse Mon Jul 29 22:01 11/382 Re: Request for a story"\
" T 65 Dormouse Mon Jul 29 22:01 12/471 Story (was Re: Request fo"\
" T 67 Dormouse Mon Jul 29 22:01 10/313 Re: Story"\
" T 69 Dormouse Mon Jul 29 22:01 10/315 Re: Story"\
" T 77 Dormouse Mon Jul 29 22:01 10/314 Re: Story"\
" T 79 Dormouse Mon Jul 29 22:01 11/358 Re: Story"\
" T 81 Dormouse Mon Jul 29 22:01 11/378 Re: Story"\
" T 83 Dormouse Mon Jul 29 22:01 10/300 Re: Story"\
" T 88 Dormouse Mon Jul 29 22:01 10/322 Re: Story"\
" T 89 Dormouse Mon Jul 29 22:01 11/390 Re: Story"\
" T 91 Dormouse Mon Jul 29 22:01 10/300 Re: Story"\
" T 92 Dormouse Mon Jul 29 22:01 13/487 Re: Story"
mail_command "untag :t"
mail_test "from :t"
# FIXME: This should be a single command, actually. But readline's echo
# seems to split so that mail_command fails.
mail_command "tag subject:/invitation/ subject:/riddle/ subject:/time/"
mail_command "tag subject:/watch/ subject:/specific/ subject:/guess/"
# seems to split it so that mail_command fails.
mail_command "tag subject:/invitation/"
mail_command "tag subject:/riddle/"
mail_command "tag subject:/time/"
mail_command "tag subject:/watch/"
mail_command "tag subject:/specific/"
mail_command "tag subject:/guess/"
mail_command "tag subject:/story/"
mail_test "from :T" \
" N 7 March Hare Sun Jul 21 20:46 10/321 Personal remark"\
" N 8 Alice Sun Jul 21 20:46 10/364 Re: Personal remark"\
" N 30 Hatter Sun Jul 21 20:46 10/333 Remark"\
" N 31 Dormouse Sun Jul 21 20:46 11/370 Re: Remark"\
" N 71 March Hare Sun Jul 21 20:46 10/307 Remark"\
" N 72 Alice Sun Jul 21 20:46 11/336 Re: Remark"\
" N 73 Hatter Sun Jul 21 20:46 11/364 Re: Remark"\
" N 74 Alice Sun Jul 21 20:46 10/323 Personal remark"\
" N 75 Hatter Sun Jul 21 20:46 10/336 Re: Personal remark"\
" N 84 Hatter Sun Jul 21 20:46 11/357 Let's move"\
" N 94 Hatter Sun Jul 21 20:46 10/317 Rude remark"\
" N 95 Alice Sun Jul 21 20:46 11/385 Thoughts"
" N 7 March Hare Mon Jul 29 22:00 10/315 Personal remark"\
" N 8 Alice Mon Jul 29 22:00 10/358 Re: Personal remark"\
" N 30 Hatter Mon Jul 29 22:00 10/327 Remark"\
" N 31 Dormouse Mon Jul 29 22:00 11/364 Re: Remark"\
" N 71 March Hare Mon Jul 29 22:01 10/301 Remark"\
" N 72 Alice Mon Jul 29 22:01 11/330 Re: Remark"\
" N 73 Hatter Mon Jul 29 22:01 11/358 Re: Remark"\
" N 74 Alice Mon Jul 29 22:01 10/317 Personal remark"\
" N 75 Hatter Mon Jul 29 22:01 10/330 Re: Personal remark"\
" N 84 Hatter Mon Jul 29 22:01 11/351 Let's move"\
" N 94 Hatter Mon Jul 29 22:01 10/311 Rude remark"\
" N 95 Alice Mon Jul 29 22:01 11/379 Thoughts"
mail_command "untag :t"
#FIXME: should be 'mail_command "print 2"'
mail_test "print 2" \
"Received: (from alice@wonder.land)"\
" by wonder.land id 3d3b1d91"\
" for hare@wonder.land; Sun, 21 Jul 2002 23:46:09 EEST"\
"Date: Sun, 21 Jul 2002 23:46:09 EEST"\
"Received: (from alice@wonder.land) "\
" by wonder.land id 3302"\
" for hare@wonder.land; Mon, 29 Jul 2002 22:00:07 +0100"\
"Date: Mon, 29 Jul 2002 22:00:02 +0100"\
"From: Alice <alice@wonder.land>"\
"Message-Id: <200207212346.3d3b1d91@wonder.land>"\
"Message-Id: <200207292200.3302@wonder.land>"\
"To: March Hare <hare@wonder.land>"\
"Subject: Re: Invitation"\
""\
"I don't see any wine"
mail_test "from :r" \
">R 2 Alice Sun Jul 21 20:46 10/317 Re: Invitation"
">R 2 Alice Mon Jul 29 22:00 10/311 Re: Invitation"
# End of tag.exp
......
......@@ -20,107 +20,107 @@ pop3d_start
pop3d_auth "user!passwd" "guessme"
## Test STAT command
pop3d_test "STAT" "+OK 95 35014"
pop3d_test "STAT" "+OK 95 34469"
## Test LIST command. This will be used twice.
proc test_list {} {
pop3d_test "LIST" \
"+OK" \
"1 317" \
"2 327" \
"3 322" \
"4 351" \
"5 368" \
"6 384" \
"7 331" \
"8 374" \
"9 360" \
"10 329" \
"11 364" \
"12 313" \
"13 354" \
"14 385" \
"15 427" \
"16 403" \
"17 460" \
"18 346" \
"19 326" \
"20 313" \
"21 363" \
"22 327" \
"23 403" \
"24 338" \
"25 421" \
"26 364" \
"27 396" \
"28 340" \
"29 336" \
"30 343" \
"31 381" \
"32 335" \
"33 339" \
"34 331" \
"35 308" \
"36 423" \
"37 389" \
"38 338" \
"39 373" \
"40 375" \
"41 668" \
"42 347" \
"43 394" \
"44 396" \
"45 339" \
"46 554" \
"47 340" \
"48 430" \
"49 365" \
"50 443" \
"51 334" \
"52 389" \
"53 382" \
"54 395" \
"55 342" \
"56 342" \
"57 358" \
"58 444" \
"59 343" \
"60 389" \
"61 399" \
"62 341" \
"63 337" \
"64 392" \
"65 489" \
"66 330" \
"67 329" \
"68 368" \
"69 331" \
"70 354" \
"71 317" \
"72 347" \
"73 375" \
"74 333" \
"75 346" \
"76 351" \
"77 330" \
"78 330" \
"79 375" \
"80 381" \
"81 395" \
"82 327" \
"83 316" \
"84 368" \
"85 371" \
"86 419" \
"87 333" \
"88 338" \
"89 407" \
"90 322" \
"91 316" \
"92 506" \
"93 347" \
"94 327" \
"95 396" \
"1 311" \
"2 321" \
"3 316" \
"4 345" \
"5 362" \
"6 378" \
"7 325" \
"8 368" \
"9 354" \
"10 323" \
"11 358" \
"12 307" \
"13 348" \
"14 379" \
"15 421" \
"16 397" \
"17 454" \
"18 340" \
"19 320" \
"20 307" \
"21 357" \
"22 321" \
"23 397" \
"24 332" \
"25 415" \
"26 358" \
"27 390" \
"28 334" \
"29 330" \
"30 337" \
"31 375" \
"32 329" \
"33 333" \
"34 325" \
"35 302" \
"36 417" \
"37 383" \
"38 332" \
"39 367" \
"40 369" \
"41 662" \
"42 341" \
"43 388" \
"44 390" \
"45 333" \
"46 548" \
"47 334" \
"48 424" \
"49 359" \
"50 437" \
"51 328" \
"52 383" \
"53 376" \
"54 389" \
"55 336" \
"56 336" \
"57 352" \
"58 438" \
"59 337" \
"60 408" \
"61 393" \
"62 335" \
"63 331" \
"64 386" \
"65 483" \
"66 324" \
"67 323" \
"68 362" \
"69 325" \
"70 348" \
"71 311" \
"72 341" \
"73 369" \
"74 327" \
"75 340" \
"76 345" \
"77 324" \
"78 324" \
"79 369" \
"80 375" \
"81 389" \
"82 321" \
"83 310" \
"84 362" \
"85 365" \
"86 413" \
"87 327" \
"88 332" \
"89 401" \
"90 316" \
"91 310" \
"92 500" \
"93 341" \
"94 321" \
"95 390" \
"."
}
......@@ -130,16 +130,16 @@ test_list
## Test RETRY on an existing message
pop3d_test "RETR 1" \
"+OK" \
"Received: (from hare@wonder.land)" \
" by wonder.land id 3d3b1d91" \
" for alice@wonder.land; Sun, 21 Jul 2002 23:46:09 EEST" \
"Date: Sun, 21 Jul 2002 23:46:09 EEST" \
"From: March Hare <hare@wonder.land>" \
"Message-Id: <200207212346.3d3b1d91@wonder.land>" \
"To: Alice <alice@wonder.land>" \
"Subject: Invitation" \
"" \
"Have some wine" \
"Received: (from hare@wonder.land) "\
" by wonder.land id 3301"\
" for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100"\
"Date: Mon, 29 Jul 2002 22:00:01 +0100"\
"From: March Hare <hare@wonder.land>"\
"Message-Id: <200207292200.3301@wonder.land>"\
"To: Alice <alice@wonder.land>"\
"Subject: Invitation"\
""\
"Have some wine"\
"."
## Test TOP command
......@@ -149,14 +149,14 @@ pop3d_test "TOP 48" \
pop3d_test "TOP 48 2" \
"+OK" \
"Received: (from hatter@wonder.land)" \
" by wonder.land id 3d3b1d95" \
" for alice@wonder.land; Sun, 21 Jul 2002 23:46:13 EEST" \
"Date: Sun, 21 Jul 2002 23:46:13 EEST" \
"From: Hatter <hatter@wonder.land>" \
"Message-Id: <200207212346.3d3b1d95@wonder.land>" \
"To: Alice <alice@wonder.land>" \
"Subject: Re: Discussing Time" \
"Received: (from hatter@wonder.land) "\
" by wonder.land id 3348"\
" for alice@wonder.land; Mon, 29 Jul 2002 22:00:53 +0100"\
"Date: Mon, 29 Jul 2002 22:00:48 +0100"\
"From: Hatter <hatter@wonder.land>"\
"Message-Id: <200207292200.3348@wonder.land>"\
"To: Alice <alice@wonder.land>"\
"Subject: Re: Discussing Time"\
"" \
"It goes on, you know in this way:--" \
"" \
......@@ -164,14 +164,14 @@ pop3d_test "TOP 48 2" \
pop3d_test "TOP 48 3" \
"+OK" \
"Received: (from hatter@wonder.land)" \
" by wonder.land id 3d3b1d95" \
" for alice@wonder.land; Sun, 21 Jul 2002 23:46:13 EEST" \
"Date: Sun, 21 Jul 2002 23:46:13 EEST" \
"From: Hatter <hatter@wonder.land>" \
"Message-Id: <200207212346.3d3b1d95@wonder.land>" \
"To: Alice <alice@wonder.land>" \
"Subject: Re: Discussing Time" \
"Received: (from hatter@wonder.land) "\
" by wonder.land id 3348"\
" for alice@wonder.land; Mon, 29 Jul 2002 22:00:53 +0100"\
"Date: Mon, 29 Jul 2002 22:00:48 +0100"\
"From: Hatter <hatter@wonder.land>"\
"Message-Id: <200207292200.3348@wonder.land>"\
"To: Alice <alice@wonder.land>"\
"Subject: Re: Discussing Time"\
"" \
"It goes on, you know in this way:--" \
"" \
......@@ -181,14 +181,14 @@ pop3d_test "TOP 48 3" \
pop3d_test "TOP 48 4" \
"+OK" \
"Received: (from hatter@wonder.land)" \
" by wonder.land id 3d3b1d95" \
" for alice@wonder.land; Sun, 21 Jul 2002 23:46:13 EEST" \
"Date: Sun, 21 Jul 2002 23:46:13 EEST" \
"From: Hatter <hatter@wonder.land>" \
"Message-Id: <200207212346.3d3b1d95@wonder.land>" \
"To: Alice <alice@wonder.land>" \
"Subject: Re: Discussing Time" \
"Received: (from hatter@wonder.land) "\
" by wonder.land id 3348"\
" for alice@wonder.land; Mon, 29 Jul 2002 22:00:53 +0100"\
"Date: Mon, 29 Jul 2002 22:00:48 +0100"\
"From: Hatter <hatter@wonder.land>"\
"Message-Id: <200207292200.3348@wonder.land>"\
"To: Alice <alice@wonder.land>"\
"Subject: Re: Discussing Time"\
"" \
"It goes on, you know in this way:--" \
"" \
......@@ -198,14 +198,14 @@ pop3d_test "TOP 48 4" \
pop3d_test "TOP 48 1000" \
"+OK" \
"Received: (from hatter@wonder.land)" \
" by wonder.land id 3d3b1d95" \
" for alice@wonder.land; Sun, 21 Jul 2002 23:46:13 EEST" \
"Date: Sun, 21 Jul 2002 23:46:13 EEST" \
"From: Hatter <hatter@wonder.land>" \
"Message-Id: <200207212346.3d3b1d95@wonder.land>" \
"To: Alice <alice@wonder.land>" \
"Subject: Re: Discussing Time" \
"Received: (from hatter@wonder.land) "\
" by wonder.land id 3348"\
" for alice@wonder.land; Mon, 29 Jul 2002 22:00:53 +0100"\
"Date: Mon, 29 Jul 2002 22:00:48 +0100"\
"From: Hatter <hatter@wonder.land>"\
"Message-Id: <200207292200.3348@wonder.land>"\
"To: Alice <alice@wonder.land>"\
"Subject: Re: Discussing Time"\
"" \
"It goes on, you know in this way:--" \
"" \
......@@ -225,14 +225,14 @@ pop3d_test "RSET" "+OK"
pop3d_test "RETR 2" \
"+OK" \
"Received: (from alice@wonder.land)" \
" by wonder.land id 3d3b1d91" \
" for hare@wonder.land; Sun, 21 Jul 2002 23:46:09 EEST" \
"Date: Sun, 21 Jul 2002 23:46:09 EEST" \
"From: Alice <alice@wonder.land>" \
"Message-Id: <200207212346.3d3b1d91@wonder.land>" \
"To: March Hare <hare@wonder.land>" \
"Subject: Re: Invitation" \
"Received: (from alice@wonder.land) "\
" by wonder.land id 3302"\
" for hare@wonder.land; Mon, 29 Jul 2002 22:00:07 +0100"\
"Date: Mon, 29 Jul 2002 22:00:02 +0100"\
"From: Alice <alice@wonder.land>"\
"Message-Id: <200207292200.3302@wonder.land>"\
"To: March Hare <hare@wonder.land>"\
"Subject: Re: Invitation"\
""\
"I don't see any wine"\
"."
......