Changeset 137:b2b8a22c47f0

Timestamp:

03/17/10 01:45:40 (5 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Cleaned up XLIST tests and fixed a few thinkos.

Files:

• livetest.py (modified) (9 diffs)

livetest.py

@@ -43 +43 @@
     return client._imap.host == 'imap.gmail.com'
 
-def extract_folder_names(dat):
+def extract_normal_folders(dat):
     ret = []
     for _, _, folder_name in dat:
@@ -59 +59 @@
     assert not client.has_capability('WONT EXIST')
 
+
 def test_list_folders(client):
     clear_folders(client)
@@ -65 +66 @@
         client.create_folder(name)
 
-    folders = extract_folder_names(client.list_folders())
+    folders = extract_normal_folders(client.list_folders())
     assert len(folders) > 0, 'No folders visible on server'
     assert 'INBOX' in [f.upper() for f in folders], 'INBOX not returned'
@@ -73 +74 @@
     #TODO: test wildcards
 
+
+def test_xlist(client):
+    clear_folders(client)
+
     caps = client.capabilities()
     if is_gmail(client):
-        assert "XLIST" in caps, caps
-    if 'XLIST' in caps:
-        info = client.xlist_folders()
-        folders = extract_folder_names(info)
-        assert len(folders) > 0, 'No folders visible on server'
-        for flags, _, _  in info:
-            if '\\INBOX' in [flag.upper() for flag in flags]:
-                break
+        assert "XLIST" in caps, "expected XLIST in Gmail's capabilities but only got %r" % caps
+
+    if not 'XLIST' in caps:
+        print "Skipping XLIST tests, server doesn't support XLIST"
+        return
+
+    info = client.xlist_folders()
+    assert len(info) > 0, 'No folders returned by XLIST'
+    for flags, _, _  in info:
+        if '\\INBOX' in [flag.upper() for flag in flags]:
+            break
         else:
             raise AssertionError('INBOX not returned', info)
 
-    for name in some_folders:
-        assert name in folders
-        
 
 def test_select_and_close(client):
@@ -104 +109 @@
     clear_folders(client)
 
-    for folder in extract_folder_names(client.list_sub_folders()):
+    for folder in extract_normal_folders(client.list_sub_folders()):
         client.unsubscribe_folder(folder)
 
@@ -114 +119 @@
         client.create_folder(folder)
 
-    all_folders = sorted(extract_folder_names(client.list_folders()))
+    all_folders = sorted(extract_normal_folders(client.list_folders()))
 
     for folder in all_folders:
         client.subscribe_folder(folder)
 
-    assert all_folders == sorted(extract_folder_names(client.list_sub_folders()))
+    assert all_folders == sorted(extract_normal_folders(client.list_sub_folders()))
 
     for folder in all_folders:
         client.unsubscribe_folder(folder)
-    assert extract_folder_names(client.list_sub_folders()) == []
+    assert extract_normal_folders(client.list_sub_folders()) == []
 
     assert_raises(imapclient.IMAPClient.Error,
@@ -148 +153 @@
 
         assert client.folder_exists(folder)
-        assert folder in extract_folder_names(client.list_folders())
+        assert folder in extract_normal_folders(client.list_folders())
 
         client.select_folder(folder)
@@ -342 +347 @@
     test_capabilities(client)
     test_list_folders(client)
+    test_xlist(client)
     test_select_and_close(client)
     test_subscriptions(client)
@@ -361 +367 @@
 def clear_folders(client):
     client.folder_encode = False
-    for folder in extract_folder_names(client.list_folders()):
+    for folder in extract_normal_folders(client.list_folders()):
         if folder.upper() != 'INBOX':
             client.delete_folder(folder)