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

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-strexp_delenda-branch
	testCatalog.py 
Log Message:



  - Rip string exceptins out by the root.

  - webdav/*:  clean up block statements for readability.

  - XXX:  Redirects are now showing up in the error log object;  need
          to filter!


=== Zope/lib/python/Products/ZCatalog/tests/testCatalog.py 1.22.12.2 => 1.22.12.2.2.1 ===
--- Zope/lib/python/Products/ZCatalog/tests/testCatalog.py:1.22.12.2	Tue Oct  7 14:25:52 2003
+++ Zope/lib/python/Products/ZCatalog/tests/testCatalog.py	Mon Nov 17 17:09:57 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')