[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/tests - testCatalog.py:1.25

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/tests
In directory cvs.zope.org:/tmp/cvs-serv30559/lib/python/Products/ZCatalog/tests

Modified Files:
	testCatalog.py 
Log Message:
 - Merge tseaver-strexp_delenda-branch to the head.


=== Zope/lib/python/Products/ZCatalog/tests/testCatalog.py 1.24 => 1.25 ===
--- Zope/lib/python/Products/ZCatalog/tests/testCatalog.py:1.24	Tue Oct  7 14:20:58 2003
+++ Zope/lib/python/Products/ZCatalog/tests/testCatalog.py	Tue Nov 18 08:17:11 2003
@@ -76,12 +76,8 @@
                          'add column failed')
 
     def testAddBad(self):
-        try:
-            self._catalog.addColumn('_id')
-        except:
-            pass
-        else:
-            raise 'invalid metadata column check failed'
+        from Products.ZCatalog.Catalog import CatalogError
+        self.assertRaises(CatalogError, self._catalog.addColumn, '_id')
 
     def testDel(self):
         self._catalog.addColumn('id')