Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 8f3e3ba6 8f3e3ba66489c8661bdf80d16b39bcdd7ef958ad by Sergey Poznyakoff
Options

Replaced [imap4d_uidvalidity] with simple regexp.

1 parent 758124a5
Inline Side-by-side
Showing 2 changed files with 14 additions and 14 deletions
...@@ -21,7 +21,7 @@ imap4d_auth "user!passwd" "guessme" ...@@ -21,7 +21,7 @@ imap4d_auth "user!passwd" "guessme"
21 imap4d_test "EXAMINE INBOX"\ 21 imap4d_test "EXAMINE INBOX"\
22 "95 EXISTS"\ 22 "95 EXISTS"\
23 "95 RECENT"\ 23 "95 RECENT"\
24 -re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\ 24 -re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
25 "OK \[UIDNEXT 96\] Predicted next uid"\ 25 "OK \[UIDNEXT 96\] Predicted next uid"\
26 "OK \[UNSEEN 1\] first unseen messsage"\ 26 "OK \[UNSEEN 1\] first unseen messsage"\
27 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\ 27 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
...@@ -31,7 +31,7 @@ imap4d_test "EXAMINE INBOX"\ ...@@ -31,7 +31,7 @@ imap4d_test "EXAMINE INBOX"\
31 imap4d_test "SELECT INBOX"\ 31 imap4d_test "SELECT INBOX"\
32 "95 EXISTS"\ 32 "95 EXISTS"\
33 "95 RECENT"\ 33 "95 RECENT"\
34 -re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\ 34 -re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
35 "OK \[UIDNEXT 96\] Predicted next uid"\ 35 "OK \[UIDNEXT 96\] Predicted next uid"\
36 "OK \[UNSEEN 1\] first unseen messsage "\ 36 "OK \[UNSEEN 1\] first unseen messsage "\
37 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\ 37 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
...@@ -39,7 +39,7 @@ imap4d_test "SELECT INBOX"\ ...@@ -39,7 +39,7 @@ imap4d_test "SELECT INBOX"\
39 "OK \[READ-WRITE\] SELECT Completed" 39 "OK \[READ-WRITE\] SELECT Completed"
40 40
41 imap4d_test "STATUS INBOX (MESSAGES RECENT UNSEEN UIDVALIDITY UIDNEXT)" \ 41 imap4d_test "STATUS INBOX (MESSAGES RECENT UNSEEN UIDVALIDITY UIDNEXT)" \
42 -re "STATUS INBOX \\(MESSAGES 95 RECENT 95 UNSEEN 95 UIDVALIDITY [imap4d_uidvalidity] UIDNEXT 96 \\)" \ 42 -re {STATUS INBOX \(MESSAGES 95 RECENT 95 UNSEEN 95 UIDVALIDITY [0-9]+ UIDNEXT 96 \)} \
43 "OK" 43 "OK"
44 44
45 imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \ 45 imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \
...@@ -49,7 +49,7 @@ imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \ ...@@ -49,7 +49,7 @@ imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \
49 imap4d_test "EXAMINE mbox1" \ 49 imap4d_test "EXAMINE mbox1" \
50 "4 EXISTS"\ 50 "4 EXISTS"\
51 "4 RECENT"\ 51 "4 RECENT"\
52 -re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\ 52 -re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
53 "OK \[UIDNEXT 5\] Predicted next uid"\ 53 "OK \[UIDNEXT 5\] Predicted next uid"\
54 "OK \[UNSEEN 1\] first unseen messsage"\ 54 "OK \[UNSEEN 1\] first unseen messsage"\
55 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\ 55 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
......
...@@ -34,7 +34,7 @@ imap4d_auth "user!passwd" "guessme" ...@@ -34,7 +34,7 @@ imap4d_auth "user!passwd" "guessme"
34 imap4d_test "SELECT mbox1" \ 34 imap4d_test "SELECT mbox1" \
35 "4 EXISTS"\ 35 "4 EXISTS"\
36 "4 RECENT"\ 36 "4 RECENT"\
37 -re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\ 37 -re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
38 "OK \[UIDNEXT 5\] Predicted next uid"\ 38 "OK \[UIDNEXT 5\] Predicted next uid"\
39 "OK \[UNSEEN 1\] first unseen messsage"\ 39 "OK \[UNSEEN 1\] first unseen messsage"\
40 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\ 40 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
...@@ -66,20 +66,20 @@ imap4d_test "FETCH 3 (FLAGS INTERNALDATE UID)"\ ...@@ -66,20 +66,20 @@ imap4d_test "FETCH 3 (FLAGS INTERNALDATE UID)"\
66 # fields as necessary. 66 # fields as necessary.
67 67
68 imap4d_test "FETCH 1:* ENVELOPE"\ 68 imap4d_test "FETCH 1:* ENVELOPE"\
69 "1 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\"((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\ 69 "1 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
70 "2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\"((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\ 70 "2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
71 "3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\ 71 "3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
72 "4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\ 72 "4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
73 "OK" 73 "OK"
74 74
75 # ALL Macro equivalent to: (FLAGS INTERNALDATE 75 # ALL Macro equivalent to: (FLAGS INTERNALDATE
76 # RFC822.SIZE ENVELOPE) 76 # RFC822.SIZE ENVELOPE)
77 77
78 imap4d_test "FETCH 1:\* ALL"\ 78 imap4d_test "FETCH 1:\* ALL"\
79 "1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:18:09 +0000\" RFC822.SIZE 1299 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\"((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\ 79 "1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:18:09 +0000\" RFC822.SIZE 1299 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
80 "2 FETCH (FLAGS (\\Recent) INTERNALDATE \"29-Dec-2001 00:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\"((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\ 80 "2 FETCH (FLAGS (\\Recent) INTERNALDATE \"29-Dec-2001 00:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
81 "3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\ 81 "3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
82 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\ 82 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
83 "OK" 83 "OK"
84 84
85 # BODYSTRUCTURE The [MIME-IMB] body structure of the message. This 85 # BODYSTRUCTURE The [MIME-IMB] body structure of the message. This
...@@ -501,7 +501,7 @@ imap4d_test "FETCH 1 FAST" \ ...@@ -501,7 +501,7 @@ imap4d_test "FETCH 1 FAST" \
501 # RFC822.SIZE ENVELOPE BODY) 501 # RFC822.SIZE ENVELOPE BODY)
502 502
503 imap4d_test "FETCH 4 FULL"\ 503 imap4d_test "FETCH 4 FULL"\
504 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" 7BIT 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\ 504 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" 7BIT 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
505 "OK" 505 "OK"
506 506
507 #end of fetch.exp 507 #end of fetch.exp
......