Merge lp:~james-page/bzr/unittest2-assertWarns into lp:bzr

[James Page]

Fix name conflict between unittest2 and test_config.py. (James Page)

unittest2 >= 0.8.0 has an assertWarns method; this conflicts with the local use of the same method name in bzrlib/tests/test_config.py.

Rename assertWarns -> assertGenerateWarns to avoid the method name being overidden by unittest2.

[Richard Wilbur (richard-wilbur)]

Thank you James for fixing the code rot.
+2

review: Approve

[Richard Wilbur (richard-wilbur)]

sent to pqm by email

[Vincent Ladeuil (vila)]

Sorry about the delay here and doubly sorry than I found your MP only after fixing the same issue in https://code.launchpad.net/~vila/bzr/1514210-config-test-failures/+merge/282591 :-/

=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py	2014-02-14 10:29:49 +0000
+++ bzrlib/tests/test_config.py	2015-07-06 11:08:23 +0000
@@ -2311,7 +2311,7 @@
     def assertConverted(self, expected, opt, value):
         self.assertEquals(expected, opt.convert_from_unicode(None, value))
 
-    def assertWarns(self, opt, value):
+    def assertGenerateWarns(self, opt, value):
         warnings = []
         def warning(*args):
             warnings.append(args[0] % args[1:])
@@ -2330,7 +2330,7 @@
         opt.invalid = None
         self.assertEquals(None, opt.convert_from_unicode(None, invalid_value))
         opt.invalid = 'warning'
-        self.assertWarns(opt, invalid_value)
+        self.assertGenerateWarns(opt, invalid_value)
         opt.invalid = 'error'
         self.assertErrors(opt, invalid_value)