From a52720a9213d760bb8a9c21b354ab46de7b763dd Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Wed, 4 Sep 2002 08:13:38 +0000
Subject: clear nonfatal stuff.

2002-09-04  Not Zed  <NotZed@Ximian.com>

	* tests/folder/test4.c (main): clear nonfatal stuff.

	* tests/folder/test6.c (main): check inbox and 'another folder'
	because some servers do different things w/ inbox.

	* providers/imap/camel-imap-message-cache.c
	(camel_imap_message_cache_get): Dont try to open the directory
	instead of an empty "" uid.

	* providers/imap/camel-imap-folder.c (imap_get_message): we dont
	want to g_return_if_fail, we need to set an exception and always
	handle the case.
	(get_message_simple): Set an exception if we get a construct
	failure.
	(imap_refresh_info): if we're refreshing inbox, force a reselect.
	this is required for at least cryus.  CHECK doesnt work either :(

	* tests/lib/folders.c (test_folder_basic): for non-local stores,
	the folder will have an extra ref for selection, take this into
	account when checking ref leaks.
	(test_folder_message_ops): Dont try to delete folder with messages
	in it, it works generally with imap.  also, change params so we
	can test different mailbox types.
	(test_folder_message_ops): disconnect remote services before
	finishing off.  doesn't need to stricly but makes ref count
	checking more accurate.
	(test_folder_message_ops): removed explicit remote sync, imap does
	it itself now ...

	* providers/imap/camel-imap-store.c:
	(camel_imap_store_finalize): call service_disconnect, so it isn't
	called later in the finalise chain, to properly cleanup on exit.

svn path=/trunk/; revision=17962
---
 camel/tests/folder/test2.c | 4 ++--
 camel/tests/folder/test4.c | 4 ++--
 camel/tests/folder/test6.c | 5 +++--
 camel/tests/folder/test7.c | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'camel/tests/folder')

diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
index 50a89f89e8..afd35b1704 100644
--- a/camel/tests/folder/test2.c
+++ b/camel/tests/folder/test2.c
@@ -44,12 +44,12 @@ int main(int argc, char **argv)
 	for (i=0;i<ARRAY_LEN(stores);i++) {
 		char *name = stores[i];
 
-		test_folder_message_ops(session, name, TRUE, FALSE);
+		test_folder_message_ops(session, name, TRUE, "testbox");
 	}
 
 	/* create a pseudo-spool file, and check that */
 	creat("/tmp/camel-test/testbox", 0600);
-	test_folder_message_ops(session, "spool:///tmp/camel-test/testbox", FALSE, TRUE);
+	test_folder_message_ops(session, "spool:///tmp/camel-test/testbox", FALSE, "INBOX");
 
 	check_unref(session, 1);
 	camel_exception_free(ex);
diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c
index eb0bd3420b..e6c58e023d 100644
--- a/camel/tests/folder/test4.c
+++ b/camel/tests/folder/test4.c
@@ -41,9 +41,9 @@ int main(int argc, char **argv)
 			/* tells make check to ignore us in the total count */
 			_exit(77);
 		}
-		camel_test_nonfatal("The IMAP code is just rooted");
+		/*camel_test_nonfatal("The IMAP code is just rooted");*/
 		test_folder_basic(session, path, FALSE, FALSE);
-		camel_test_fatal();
+		/*camel_test_fatal();*/
 	}
 
 	camel_object_unref((CamelObject *)session);
diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c
index 215fa999bf..f0fd8a25ee 100644
--- a/camel/tests/folder/test6.c
+++ b/camel/tests/folder/test6.c
@@ -1,7 +1,7 @@
 /* folder testing */
 
 #include "camel-test.h"
-#include "messages.h"
+#include "folders.h"
 #include "session.h"
 
 #include <camel/camel-exception.h>
@@ -44,7 +44,8 @@ int main(int argc, char **argv)
 			_exit(77);
 		}
 		/*camel_test_nonfatal("The IMAP code is just rooted");*/
-		test_folder_message_ops(session, path, FALSE);
+		test_folder_message_ops(session, path, FALSE, "testbox");
+		test_folder_message_ops(session, path, FALSE, "INBOX");
 		/*camel_test_fatal();*/
 	}
 
diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c
index 2f08712e4c..3dee12916d 100644
--- a/camel/tests/folder/test7.c
+++ b/camel/tests/folder/test7.c
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 			_exit(77);
 		}
 		camel_test_nonfatal("Dont know how many tests apply to NNTP");
-		test_folder_message_ops(session, path, FALSE);
+		test_folder_message_ops(session, path, FALSE, "testbox");
 		camel_test_fatal();
 	}
 
-- 
cgit v1.2.3