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 files changed, 19 insertions, 11 deletions

diff --git a/imap4d/testsuite/imap4d/list.exp b/imap4d/testsuite/imap4d/list.exp
index 21c477e66..c8ee441d4 100644
--- a/imap4d/testsuite/imap4d/list.exp
+++ b/imap4d/testsuite/imap4d/list.exp
@@ -1,6 +1,6 @@
 # -*- tcl -*-
 # This file is part of Mailutils testsuite.
-# Copyright (C) 2002, Free Software Foundation
+# Copyright (C) 2002, 2005 Free Software Foundation
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,36 +19,44 @@
 imap4d_start 
 imap4d_auth "user!passwd" "guessme"
 
-imap4d_test "LIST \"~\" \"*\""\
+imap4d_test -sort "LIST \"~\" \"*\""\
 "LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/mbox"\
 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/relational.mbox" \
 "OK LIST Completed"
 
-imap4d_test "LIST \"~\" \"%\""\
+imap4d_test -sort "LIST \"~\" \"%\""\
 "LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/mbox"\
 "LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/relational.mbox" \
 "OK LIST Completed"
 
-imap4d_test "LIST \"\" \"*\""\
+imap4d_test -sort "LIST \"\" \"*\""\
 "LIST (\\NoInferiors) NIL INBOX"\
 "LIST (\\NoInferiors) \"/\" mbox1"\
 "LIST (\\NoInferiors) \"/\" mbox"\
 "LIST (\\NoInferiors) \"/\" sieve.mbox"\
 "LIST (\\NoInferiors) \"/\" teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" relational.mbox" \
 "OK LIST Completed"
 
 imap4d_test "LIST \"/\" \"*\""\
 "NO LIST The requested item could not be found."
 
-imap4d_test "LIST \"$MU_DATA_DIR\" \"*\""\
+imap4d_test -sort "LIST \"$MU_DATA_DIR\" \"*\""\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/mail.rc"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/passwd"\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/relational.mbox" \
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox1"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/sieve.mbox"\
@@ -56,26 +64,26 @@ imap4d_test "LIST \"$MU_DATA_DIR\" \"*\""\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/two"\
-"OK"	
+"OK LIST Completed"	
 
-imap4d_test "LIST \"$MU_DATA_DIR\" \"%\""\
+imap4d_test -sort "LIST \"$MU_DATA_DIR\" \"%\""\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/etc"\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\
-"OK"	
+"OK LIST Completed"	
 
 imap4d_test "LIST \"$MU_DATA_DIR/folder\" \"one\""\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\
-"OK"
+"OK LIST Completed"
 
 # Well, I doubt if this is quite OK with the RFC, but at least it does
 # not contradict it. The first INBOX refers to the reserved word meaning
 # "the primary mailbox for this user on this server", the second one is
 # the actual filename.
-imap4d_test "LIST \"\" INBOX"\
+imap4d_test -sort "LIST \"\" INBOX"\
 "LIST (\\NoInferiors) NIL INBOX"\
 "LIST (\\NoInferiors) \"/\" INBOX"\
-"OK"	
+"OK LIST Completed"	
 
 imap4d_stop