[CMF-checkins] CVS: Products/CMFCore/tests - test_CMFCatalogAware.py:1.4

[Florent Guillaume]

Update of /cvs-repository/Products/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv23714/CMFCore/tests

Modified Files:
	test_CMFCatalogAware.py 
Log Message:
Merge from 1.5 branch:
CMFCatalogAware: allow easy subclassing of the "security indexes" that
are reindexed by reindexObjectSecurity(), through the attribute
_cmf_security_indexes.



=== Products/CMFCore/tests/test_CMFCatalogAware.py 1.3 => 1.4 ===
--- Products/CMFCore/tests/test_CMFCatalogAware.py:1.3	Fri Apr 22 14:44:56 2005
+++ Products/CMFCore/tests/test_CMFCatalogAware.py	Fri Jun  3 13:31:33 2005
@@ -147,9 +147,9 @@
         l = list(cat.log)
         l.sort()
         self.assertEquals(l, [
-            "reindex /site/foo ['allowedRolesAndUsers']",
-            "reindex /site/foo/bar ['allowedRolesAndUsers']",
-            "reindex /site/foo/hop ['allowedRolesAndUsers']",
+            "reindex /site/foo ('allowedRolesAndUsers',)",
+            "reindex /site/foo/bar ('allowedRolesAndUsers',)",
+            "reindex /site/foo/hop ('allowedRolesAndUsers',)",
             ])
         self.failIf(foo.notified)
         self.failIf(bar.notified)
@@ -168,9 +168,9 @@
         l = list(cat.log)
         l.sort()
         self.assertEquals(l, [
-            "reindex /site/foo ['allowedRolesAndUsers']",
-            "reindex /site/foo/bar ['allowedRolesAndUsers']",
-            "reindex /site/foo/hop ['allowedRolesAndUsers']",
+            "reindex /site/foo ('allowedRolesAndUsers',)",
+            "reindex /site/foo/bar ('allowedRolesAndUsers',)",
+            "reindex /site/foo/hop ('allowedRolesAndUsers',)",
             ])
         self.failIf(foo.notified)
         self.failIf(bar.notified)
@@ -194,7 +194,7 @@
         cat.setObs([foo, missing])
         foo.reindexObjectSecurity()
         self.assertEquals(cat.log,
-                          ["reindex /site/foo ['allowedRolesAndUsers']"])
+                          ["reindex /site/foo ('allowedRolesAndUsers',)"])
         self.failIf(foo.notified)
         self.failIf(missing.notified)
 
@@ -208,7 +208,7 @@
         cat.setObs([foo, missing])
         foo.reindexObjectSecurity()
         self.assertEquals(cat.log,
-                          ["reindex /site/foo ['allowedRolesAndUsers']"])
+                          ["reindex /site/foo ('allowedRolesAndUsers',)"])
         self.failIf(foo.notified)
         self.failIf(missing.notified)