Rev 6396: Remerge pre-requisite fixes in file:///home/vila/src/bzr/bugs/907268-bazaar-DEFAULT/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Dec 21 15:08:05 UTC 2011
At file:///home/vila/src/bzr/bugs/907268-bazaar-DEFAULT/
------------------------------------------------------------
revno: 6396 [merge]
revision-id: v.ladeuil+lp at free.fr-20111221150805-xn21ne38f2p2xkxu
parent: v.ladeuil+lp at free.fr-20111221105543-k2e6t3d001vy84h1
parent: v.ladeuil+lp at free.fr-20111221150215-48asvpm50dumeblc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 907268-bazaar-DEFAULT
timestamp: Wed 2011-12-21 16:08:05 +0100
message:
Remerge pre-requisite fixes
modified:
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
-------------- next part --------------
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py 2011-12-21 10:42:34 +0000
+++ b/bzrlib/tests/test_config.py 2011-12-21 15:02:15 +0000
@@ -2728,8 +2728,8 @@
def test_empty_string(self):
if isinstance(self.store, config.IniFileStore):
# configobj._quote doesn't handle empty values
- with testtools.ExpectedException(AssertionError):
- self.assertIdempotent('')
+ self.assertRaises(AssertionError,
+ self.assertIdempotent, '')
else:
self.assertIdempotent('')
# But quoted empty strings are ok
@@ -2744,8 +2744,8 @@
def test_simple_comma(self):
if isinstance(self.store, config.IniFileStore):
# configobj requires that lists are special-cased
- with testtools.ExpectedException(AssertionError):
- self.assertIdempotent(',')
+ self.assertRaises(AssertionError,
+ self.assertIdempotent, ',')
else:
self.assertIdempotent(',')
# When a single comma is required, quoting is also required
@@ -2754,8 +2754,8 @@
def test_list(self):
if isinstance(self.store, config.IniFileStore):
# configobj requires that lists are special-cased
- with testtools.ExpectedException(AssertionError):
- self.assertIdempotent('a,b')
+ self.assertRaises(AssertionError,
+ self.assertIdempotent, 'a,b')
else:
self.assertIdempotent('a,b')
More information about the bazaar-commits
mailing list