Rev 6389: Cannot use ExpectedException as pqm provides only testtools-0.9.8, 0.9.9 needed in file:///home/vila/src/bzr/bugs/906897-quoting-stores/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/906897-quoting-stores/

------------------------------------------------------------
revno: 6389
revision-id: v.ladeuil+lp at free.fr-20111221150215-48asvpm50dumeblc
parent: v.ladeuil+lp at free.fr-20111221104234-ejo8i4yzwi1jdoui
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 906897-quoting-stores
timestamp: Wed 2011-12-21 16:02:15 +0100
message:
  Cannot use ExpectedException as pqm provides only testtools-0.9.8, 0.9.9 needed
-------------- 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')