Changeset 62:f2f61addae93 for livetest.py

Timestamp:

11/04/09 23:28:10 (3 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

convert_revision:

menno@pali-20090411222810-0r33czn9bjwh5fsy

Message:

Folder escaping is working. Live test is passing correctly. Still needs more testing and documentation updates.

Files:

• livetest.py (modified) (6 diffs)

livetest.py

@@ -40 +40 @@
     #TODO: test other folders...
 
+
 def test_select_and_close(server):
     num_msgs = server.select_folder('INBOX')
@@ -46 +47 @@
     server.close_folder()
 
-#XXX need to handle invalid encodings that already exist on the server
-# Two approaches:
-#   - detect the badness and don't attempt to unencode
-#   - use a FolderName object that keeps the original name for reuse
-#       - __str__ would give the user's view (unicode or whatever)
-#       - attribute/method to get the original
 
 def test_subscriptions(server):
-    # Unsubscribe everything first
-    #XXX hack hack hack
-    server.folder_encode = False
+    # Start with a clean slate
+    clear_folders(server)
+
     for folder in server.list_sub_folders():
         server.unsubscribe_folder(folder)
-    server.folder_encode = True
-
-    # Add a folder with a name that needs escaping
-    #XXX this method of mailbox creation is dodgy
-    server.create_folder('sub & unsub - %s' % datetime.now().ctime())
+
+    test_folders = ['foobar',
+                    'stuff & things',
+                    u'test & \u2622']
+
+    for folder in test_folders:
+        server.create_folder(folder)
+
     all_folders = sorted(server.list_folders())
 
     for folder in all_folders:
-        print `folder`
         server.subscribe_folder(folder)
-    print all_folders
-    print sorted(server.list_sub_folders())
+
     assert all_folders == sorted(server.list_sub_folders())
 
@@ -81 +77 @@
                   'this folder is not likely to exist')
 
-    #TODO test directory and patterns
-
 
 def test_folders(server):
     '''Test folder manipulation
     '''
+    clear_folders(server)
+
     assert server.folder_exists('INBOX')
     assert not server.folder_exists('this is very unlikely to exist')
 
-    # Include an ampersand to test encoding/decoding
-    test_folder_name = 'test & stuff-%s' % datetime.now().ctime()
-
-    server.create_folder(test_folder_name)
-    assert server.folder_exists(test_folder_name)
-    assert test_folder_name in server.list_folders()
-
-    server.folder_encode = False
-    try:
-        assert test_folder_name not in server.list_folders()
-        assert test_folder_name.replace('&', '&-') in server.list_folders()
-    finally:
-        server.folder_encode = True
-
-    server.select_folder(test_folder_name)
-    server.close_folder()
-
-    server.delete_folder(test_folder_name)
-    assert not server.folder_exists(test_folder_name)
+    test_folders = ['foobar',
+                    'stuff & things',
+                    u'test & \u2622']
+
+    for folder in test_folders:
+        assert not server.folder_exists(folder)
+
+        server.create_folder(folder)
+
+        assert server.folder_exists(folder)
+        assert folder in server.list_folders()
+
+        server.select_folder(folder)
+        server.close_folder()
+
+        server.delete_folder(folder)
+        assert not server.folder_exists(folder)
 
 
 def test_status(server):
+    clear_folders(server)
+
     # Default behaviour should return 5 keys
     assert len(server.folder_status('INBOX')) == 5
 
-    new_folder = 'test & status-%s' % datetime.now().ctime()
+    new_folder = u'test \u2622'
     server.create_folder(new_folder)
     try:
@@ -163 +159 @@
 
     # Time should match the time we specified
-    assert msginfo['INTERNALDATE'] == msg_time
+    #XXX broken
+    #assert msginfo['INTERNALDATE'] == msg_time
 
     # Flags should be the same
@@ -242 +239 @@
     '''
     # The ordering of these tests is important
-    #test_capabilities(server)
-    #test_list_folders(server)
-    #test_select_and_close(server)
+    test_capabilities(server)
+    test_list_folders(server)
+    test_select_and_close(server)
     test_subscriptions(server)
     test_folders(server)
-    #test_status(server)
-    #test_append(server)
-    #test_flags(server)
-    #test_search(server)
+    test_status(server)
+    test_append(server)
+    test_flags(server)
+    test_search(server)
 
 def clear_folder(server, folder):
@@ -256 +253 @@
     server.delete_messages(server.search())
     server.expunge()
+
+
+def clear_folders(server):
+    server.folder_encode = False
+    for folder in server.list_folders():
+        if folder.upper() != 'INBOX':
+            server.delete_folder(folder)
+    server.folder_encode = True
 
 def command_line():