[Checkins] SVN: grok/trunk/ Stop including * for ZCML. This made the functional tests run more

[Martijn Faassen]

Log message for revision 71077:
  Stop including * for ZCML. This made the functional tests run more
  slowly and Zope start more slowly as well. In addition, it required
  us to actually list the eggs for grokwiki and grokblog for the
  testrunner as it tried to load up their ZCML.
  
  To run the functional tests now, cd into parts/testinstance and do
  ../../bin/test
  

Changed:
  U   grok/trunk/INSTALL.txt
  U   grok/trunk/buildout.cfg

-=-
Modified: grok/trunk/INSTALL.txt
===================================================================
--- grok/trunk/INSTALL.txt	2006-11-05 01:23:34 UTC (rev 71076)
+++ grok/trunk/INSTALL.txt	2006-11-05 12:29:58 UTC (rev 71077)
@@ -23,12 +23,28 @@
     $ bin/buildout
     [lots of stuff will be downloaded and installed locally here]
 
+Running the demo applications
+-----------------------------
+
+Start the instance:
+
+   $ cd parts/instance
+   $ bin/zopectl fg
+
+If you now connect to port 8080 and log in with username 'grok',
+password 'grok', you should be able to add the grok-based applications
+(such as grokwiki) from the menu.
+
 Running the tests
 -----------------
 
-Due to a bug in Zope, we need to run the tests this way:
+Due to a bug in Zope, we need to run the tests this way, from a
+special instance directory:
 
-    $ cd parts/instance
+    $ cd parts/testinstance
     $ ../../bin/test
 
-otherwise you will get an error about not finding 'ftesting.zcml'.
+otherwise you will get an error about not finding
+'ftesting.zcml'. We've set up a special test instance just for running
+the test from, which includes the minimum needed ZCML (so the tests
+run faster).

Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2006-11-05 01:23:34 UTC (rev 71076)
+++ grok/trunk/buildout.cfg	2006-11-05 12:29:58 UTC (rev 71077)
@@ -1,9 +1,7 @@
 [buildout]
 develop = . grokwiki ldapaddressbook grokblog
-parts = zope3 data instance test
+parts = zope3 data instance testdata testinstance test
 
-# find-links = http://download.zope.org/distribution/
-
 [zope3]
 recipe = zc.recipe.zope3checkout
 url = svn://svn.zope.org/repos/main/Zope3/branches/3.3
@@ -11,6 +9,33 @@
 [data]
 recipe = zc.recipe.filestorage
 
+[testdata]
+recipe = zc.recipe.filestorage
+
+[testinstance]
+recipe = zc.recipe.zope3instance
+database = testdata
+user = grok:grok
+eggs = setuptools
+       grok
+zcml = zope.annotation
+       zope.copypastemove
+       zope.formlib
+       zope.i18n-meta
+       zope.i18n.locales
+       zope.publisher
+       zope.security-meta
+       zope.size
+       zope.traversing
+       zope.traversing.browser
+       zope.app    
+       zope.app-meta
+       zope.app.securitypolicy
+       zope.app.securitypolicy-meta
+       zope.app.authentication
+       grok
+       grok-meta
+
 [instance]
 recipe = zc.recipe.zope3instance
 database = data
@@ -20,7 +45,23 @@
        grokwiki
        grokblog
 
-zcml = *
+zcml = zope.annotation
+       zope.copypastemove
+       zope.formlib
+       zope.i18n-meta
+       zope.i18n.locales
+       zope.publisher
+       zope.security-meta
+       zope.size
+       zope.traversing
+       zope.traversing.browser
+       zope.app    
+       zope.app-meta
+       zope.app.securitypolicy
+       zope.app.securitypolicy-meta
+       zope.app.authentication
+       zope.app.twisted
+
        grok
        grok-meta
        grokwiki
@@ -29,8 +70,6 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = grok
-       grokwiki
-       grokblog
 extra-paths = parts/zope3/src
 defaults = ['--tests-pattern', '^f?tests$',
             '-v'