Commit 3bfd165d 3bfd165d3ff81fc8c10c663e44edb8fdac56e9da by Sergey Poznyakoff

Use new -sort flag to avoid dependency on any particular ordering.

Also corrected expected outputs due to inclusion of two new mailboxes
quite some time ago (this went unnoticed so far due to fuzzy matching
technique + ordering-dependent output).
1 parent bc7cf307
1 # -*- tcl -*- 1 # -*- tcl -*-
2 # This file is part of Mailutils testsuite. 2 # This file is part of Mailutils testsuite.
3 # Copyright (C) 2002, Free Software Foundation 3 # Copyright (C) 2002, 2005 Free Software Foundation
4 # 4 #
5 # This program is free software; you can redistribute it and/or modify 5 # This program is free software; you can redistribute it and/or modify
6 # it under the terms of the GNU General Public License as published by 6 # it under the terms of the GNU General Public License as published by
...@@ -19,36 +19,44 @@ ...@@ -19,36 +19,44 @@
19 imap4d_start 19 imap4d_start
20 imap4d_auth "user!passwd" "guessme" 20 imap4d_auth "user!passwd" "guessme"
21 21
22 imap4d_test "LIST \"~\" \"*\""\ 22 imap4d_test -sort "LIST \"~\" \"*\""\
23 "LIST (\\NoInferiors) \"/\" ~/mbox1"\ 23 "LIST (\\NoInferiors) \"/\" ~/mbox1"\
24 "LIST (\\NoInferiors) \"/\" ~/mbox"\ 24 "LIST (\\NoInferiors) \"/\" ~/mbox"\
25 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\ 25 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
26 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\ 26 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
27 "LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
28 "LIST (\\NoInferiors) \"/\" ~/relational.mbox" \
27 "OK LIST Completed" 29 "OK LIST Completed"
28 30
29 imap4d_test "LIST \"~\" \"%\""\ 31 imap4d_test -sort "LIST \"~\" \"%\""\
30 "LIST (\\NoInferiors) \"/\" ~/mbox1"\ 32 "LIST (\\NoInferiors) \"/\" ~/mbox1"\
31 "LIST (\\NoInferiors) \"/\" ~/mbox"\ 33 "LIST (\\NoInferiors) \"/\" ~/mbox"\
32 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\ 34 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
33 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\ 35 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
36 "LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
37 "LIST (\\NoInferiors) \"/\" ~/relational.mbox" \
34 "OK LIST Completed" 38 "OK LIST Completed"
35 39
36 imap4d_test "LIST \"\" \"*\""\ 40 imap4d_test -sort "LIST \"\" \"*\""\
37 "LIST (\\NoInferiors) NIL INBOX"\ 41 "LIST (\\NoInferiors) NIL INBOX"\
38 "LIST (\\NoInferiors) \"/\" mbox1"\ 42 "LIST (\\NoInferiors) \"/\" mbox1"\
39 "LIST (\\NoInferiors) \"/\" mbox"\ 43 "LIST (\\NoInferiors) \"/\" mbox"\
40 "LIST (\\NoInferiors) \"/\" sieve.mbox"\ 44 "LIST (\\NoInferiors) \"/\" sieve.mbox"\
41 "LIST (\\NoInferiors) \"/\" teaparty.mbox"\ 45 "LIST (\\NoInferiors) \"/\" teaparty.mbox"\
46 "LIST (\\NoInferiors) \"/\" bigto.mbox"\
47 "LIST (\\NoInferiors) \"/\" relational.mbox" \
42 "OK LIST Completed" 48 "OK LIST Completed"
43 49
44 imap4d_test "LIST \"/\" \"*\""\ 50 imap4d_test "LIST \"/\" \"*\""\
45 "NO LIST The requested item could not be found." 51 "NO LIST The requested item could not be found."
46 52
47 imap4d_test "LIST \"$MU_DATA_DIR\" \"*\""\ 53 imap4d_test -sort "LIST \"$MU_DATA_DIR\" \"*\""\
48 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\ 54 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\
49 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/mail.rc"\ 55 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/mail.rc"\
50 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/passwd"\ 56 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/passwd"\
51 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\ 57 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\
58 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/bigto.mbox"\
59 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/relational.mbox" \
52 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox1"\ 60 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox1"\
53 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox"\ 61 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox"\
54 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/sieve.mbox"\ 62 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/sieve.mbox"\
...@@ -56,26 +64,26 @@ imap4d_test "LIST \"$MU_DATA_DIR\" \"*\""\ ...@@ -56,26 +64,26 @@ imap4d_test "LIST \"$MU_DATA_DIR\" \"*\""\
56 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\ 64 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\
57 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\ 65 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\
58 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/two"\ 66 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/two"\
59 "OK" 67 "OK LIST Completed"
60 68
61 imap4d_test "LIST \"$MU_DATA_DIR\" \"%\""\ 69 imap4d_test -sort "LIST \"$MU_DATA_DIR\" \"%\""\
62 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\ 70 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\
63 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\ 71 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\
64 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\ 72 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\
65 "OK" 73 "OK LIST Completed"
66 74
67 imap4d_test "LIST \"$MU_DATA_DIR/folder\" \"one\""\ 75 imap4d_test "LIST \"$MU_DATA_DIR/folder\" \"one\""\
68 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\ 76 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\
69 "OK" 77 "OK LIST Completed"
70 78
71 # Well, I doubt if this is quite OK with the RFC, but at least it does 79 # Well, I doubt if this is quite OK with the RFC, but at least it does
72 # not contradict it. The first INBOX refers to the reserved word meaning 80 # not contradict it. The first INBOX refers to the reserved word meaning
73 # "the primary mailbox for this user on this server", the second one is 81 # "the primary mailbox for this user on this server", the second one is
74 # the actual filename. 82 # the actual filename.
75 imap4d_test "LIST \"\" INBOX"\ 83 imap4d_test -sort "LIST \"\" INBOX"\
76 "LIST (\\NoInferiors) NIL INBOX"\ 84 "LIST (\\NoInferiors) NIL INBOX"\
77 "LIST (\\NoInferiors) \"/\" INBOX"\ 85 "LIST (\\NoInferiors) \"/\" INBOX"\
78 "OK" 86 "OK LIST Completed"
79 87
80 imap4d_stop 88 imap4d_stop
81 89
......