Changeset 198:c50410e90fab

Timestamp:

01/25/11 17:34:11 (16 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

If unittest in stdlib is unittest2 use it.

Otherwise look for a separately installed unittest2 package.

Files:

• imapclient/test/test_IMAPClient.py (modified) (1 diff)
• imapclient/test/test_fixed_offset.py (modified) (1 diff)
• imapclient/test/test_imap_utf7.py (modified) (1 diff)
• imapclient/test/test_response_parser.py (modified) (1 diff)
• imapclient/test/util.py (added)
• livetest.py (modified) (4 diffs)

imapclient/test/test_IMAPClient.py

@@ -8 +8 @@
 from imapclient.test.mock import patch, sentinel, Mock
 from imapclient.test.testable_imapclient import TestableIMAPClient as IMAPClient
-import unittest
-
+from imapclient.test.util import unittest
 
 class IMAPClientTest(unittest.TestCase):

imapclient/test/test_fixed_offset.py

@@ -3 +3 @@
 # Please see http://en.wikipedia.org/wiki/BSD_licenses
 
-import unittest
 from datetime import timedelta
+from imapclient.test.util import unittest
 from imapclient.fixed_offset import FixedOffset
 from imapclient.test.mock import patch

imapclient/test/test_imap_utf7.py

@@ -24 +24 @@
 
 from imapclient.imap_utf7 import decode, encode, FolderNameError
-import unittest
-
+from imapclient.test.util import unittest
 
 class IMAP4UTF7TestCase(unittest.TestCase):

imapclient/test/test_response_parser.py

@@ -21 +21 @@
 from datetime import datetime
 from textwrap import dedent
-import unittest
+from imapclient.fixed_offset import FixedOffset
 from imapclient.response_parser import parse_response, parse_fetch_response, ParseError
-from imapclient.fixed_offset import FixedOffset
+from imapclient.test.util import unittest
 from pprint import pformat
 

livetest.py

@@ -9 +9 @@
 import os
 import sys
-import unittest2
 from datetime import datetime
 from ConfigParser import SafeConfigParser, NoOptionError
 
 import imapclient
-
-# TODO helper to try stdlib unittest first (for Python 2.7/3.2)
+from imapclient.test.util import unittest
+
 # TODO cleaner verbose output: avoid "__main__" and separater between classes
 
@@ -50 +49 @@
 def createLiveTestClass(host, username, password, port, ssl, use_uid, namespace):
 
-    class LiveTest(unittest2.TestCase):
+    class LiveTest(unittest.TestCase):
 
         def setUp(self):
@@ -470 +469 @@
     print >> sys.stderr, msg
     print >> sys.stderr
-    print >> sys.stderr, "usage: %s <livetest.ini> [ optional unittest2 arguments ]" % sys.argv[0]
+    print >> sys.stderr, "usage: %s <livetest.ini> [ optional unittest arguments ]" % sys.argv[0]
     sys.exit(1)
 
@@ -508 +507 @@
     add_test_class('TestWithoutUIDs', createLiveTestClass(use_uid=False, **host_config))
 
-    unittest2.main(module='livetests')
+    unittest.main(module='livetests')
 
 if __name__ == '__main__':