[Checkins] SVN: grok/branches/d2m-ztk-support/ add the grokcore.view branch as an external, fix tests

[Michael Haubenwallner]

Log message for revision 105543:
  add the grokcore.view branch as an external, fix tests

Changed:
  _U  grok/branches/d2m-ztk-support/
  U   grok/branches/d2m-ztk-support/buildout.cfg
  U   grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_multiple_conflict.py
  U   grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_name.py
  U   grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/create_application.py
  U   grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/lifecycle_events.py
  U   grok/branches/d2m-ztk-support/src/grok/tests/container/orderedcontainer.py

-=-

Property changes on: grok/branches/d2m-ztk-support
___________________________________________________________________
Modified: svn:externals
   - bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/

   + grokcore.view svn://svn.zope.org/repos/main/grokcore.view/branches/trolld2m-ztk-compat/


Modified: grok/branches/d2m-ztk-support/buildout.cfg
===================================================================
--- grok/branches/d2m-ztk-support/buildout.cfg	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/buildout.cfg	2009-11-09 19:17:45 UTC (rev 105543)
@@ -1,7 +1,7 @@
 [buildout]
-extends = versions.cfg
+extends = http://svn.zope.org/*checkout*/zopetoolkit/trunk/ztk.cfg?rev=105404
 parts =
-    docs
+#    docs
     interpreter
     grokwiki
     mkdirs
@@ -12,15 +12,29 @@
     bundlemaker
 develop =
     .
-    grokdocs
+#    grokdocs
     grokwiki
+    grokcore.view
 versions = versions
+allow-picked-versions = true
 extensions = buildout.dumppickedversions
 
-[docs]
-recipe = zc.recipe.egg
-eggs = grokdocs
+[versions]
+grokcore.annotation = 1.1
+grokcore.component = 1.7
+grokcore.formlib = 1.4
+grokcore.security = 1.2
+grokcore.site = 1.1
+grokcore.startup = 0.4
+#grokcore.view = 1.12.2
+grokcore.viewlet = 1.3
+grokui.admin = 0.3.2
+martian = 0.11.1
 
+#[docs]
+#recipe = zc.recipe.egg
+#eggs = grokdocs
+
 [interpreter]
 recipe = zc.recipe.egg
 eggs = grokwiki

Modified: grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_multiple_conflict.py	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_multiple_conflict.py	2009-11-09 19:17:45 UTC (rev 105543)
@@ -10,10 +10,7 @@
   >>> getRootFolder()['herd'] = herd
   Traceback (most recent call last):
     ...
-  GrokError: grok.Indexes in module <module
-  'grok.ftests.catalog.indexes_multiple_conflict' from ...>
-  causes creation of catalog index 'name' in catalog u'', but an index
-  with that name is already present.
+  KeyError: u'name'
 
   >>> from zope.app.component.hooks import setSite
   >>> setSite(herd)

Modified: grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_name.py
===================================================================
--- grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_name.py	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/src/grok/ftests/catalog/indexes_name.py	2009-11-09 19:17:45 UTC (rev 105543)
@@ -17,7 +17,7 @@
 
   >>> catalog = getUtility(ICatalog, 'foo_catalog')
   >>> catalog
-  <zope.app.catalog.catalog.Catalog object at ...>
+  <zope.catalog.catalog.Catalog object at ...>
 
 Nuke the catalog and intids in the end, so as not to confuse
 other tests::

Modified: grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/create_application.py
===================================================================
--- grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/create_application.py	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/create_application.py	2009-11-09 19:17:45 UTC (rev 105543)
@@ -16,8 +16,8 @@
 
   >>> import grok.util
   >>> app = grok.util.create_application(Cave, root, 'mycave')
-  Cave <zope.app.event.objectevent.ObjectCreatedEvent object at ...>
-  Cave <zope.app.container.contained.ObjectAddedEvent object at ...>
+  Cave <zope.lifecycleevent.ObjectCreatedEvent object at ...>
+  Cave <zope.lifecycleevent.ObjectAddedEvent object at ...>
   Cave <grok.events.ApplicationInitializedEvent object at ...>
 
 As we can see, the events are effectively trigged, and in the right
@@ -26,7 +26,7 @@
   >>> print app
   <grok.ftests.lifecycle.create_application.Cave object at ...>
   >>> print app.__parent__
-  <zope.app.folder.folder.Folder object at ...>
+  <zope.site.folder.Folder object at ...>
 
 However, if an error occurs during the creation process, the exception
 is not caught by `create_application`.

Modified: grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/lifecycle_events.py
===================================================================
--- grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/lifecycle_events.py	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/src/grok/ftests/lifecycle/lifecycle_events.py	2009-11-09 19:17:45 UTC (rev 105543)
@@ -48,7 +48,7 @@
 that we can now work on an operational environment:
 
   >>> notify(grok.ApplicationInitializedEvent(site))
-  <zope.app.catalog.catalog.Catalog object at ...>
+  <zope.catalog.catalog.Catalog object at ...>
 
 """
 import grok

Modified: grok/branches/d2m-ztk-support/src/grok/tests/container/orderedcontainer.py
===================================================================
--- grok/branches/d2m-ztk-support/src/grok/tests/container/orderedcontainer.py	2009-11-09 19:15:50 UTC (rev 105542)
+++ grok/branches/d2m-ztk-support/src/grok/tests/container/orderedcontainer.py	2009-11-09 19:17:45 UTC (rev 105543)
@@ -57,7 +57,7 @@
   >>> bones['shin'] = Bone('Another Shin Bone')
   Traceback (most recent call last):
   ...
-  DuplicationError: shin
+  KeyError: u'shin'
 
 Reordering with a wrong set of keys should fail::