[Checkins] SVN: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ Move one ftest to a regular test because it tests an error during grokking,

[Philipp von Weitershausen]

Log message for revision 79221:
  Move one ftest to a regular test because it tests an error during grokking,
  which would be fatal now that the layer does the fixture grokking.
  

Changed:
  D   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_no_app.py
  A   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/
  A   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/__init__.py
  A   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/indexes_no_app.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/test_grok.py

-=-
Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_no_app.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_no_app.py	2007-08-24 11:46:06 UTC (rev 79220)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_no_app.py	2007-08-24 11:47:04 UTC (rev 79221)
@@ -1,30 +0,0 @@
-"""
-Grok allows you to set up catalog indexes in your application with a
-special indexes declaration.  We do need to specify a site (such as
-the application) for the Indexes however, otherwise we get a GrokError:
-
-  >>> import grok
-  >>> grok.grok('grok.ftests.catalog.indexes_no_app')
-  Traceback (most recent call last):
-    ...
-  GrokError: No site specified for grok.Indexes subclass in module
-  <module 'grok.ftests.catalog.indexes_no_app' from ...>.
-  Use grok.site() to specify.
-  
-"""
-import grok
-from grok import index
-
-class Herd(grok.Container, grok.Application):
-    pass
-
-class Mammoth(grok.Model):
-    pass
-
-class MammothIndexes(grok.Indexes):
-    grok.context(Mammoth)
-    grok.name('foo_catalog')
-    
-    name = index.Field()
-    age = index.Field()
-    message = index.Text()

Added: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/__init__.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/__init__.py	                        (rev 0)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/__init__.py	2007-08-24 11:47:04 UTC (rev 79221)
@@ -0,0 +1 @@
+# this is a package


Property changes on: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/__init__.py
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/indexes_no_app.py (from rev 79217, grok/trunk/src/grok/ftests/catalog/indexes_no_app.py)
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/indexes_no_app.py	                        (rev 0)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/catalog/indexes_no_app.py	2007-08-24 11:47:04 UTC (rev 79221)
@@ -0,0 +1,29 @@
+"""
+Grok allows you to set up catalog indexes in your application with a
+special indexes declaration.  We do need to specify a site (such as
+the application) for the Indexes however, otherwise we get a GrokError:
+
+  >>> grok.grok(__name__)
+  Traceback (most recent call last):
+    ...
+  GrokError: No site specified for grok.Indexes subclass in module
+  <module 'grok.tests.catalog.indexes_no_app' from ...>.
+  Use grok.site() to specify.
+  
+"""
+import grok
+from grok import index
+
+class Herd(grok.Container, grok.Application):
+    pass
+
+class Mammoth(grok.Model):
+    pass
+
+class MammothIndexes(grok.Indexes):
+    grok.context(Mammoth)
+    grok.name('foo_catalog')
+    
+    name = index.Field()
+    age = index.Field()
+    message = index.Text()

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/test_grok.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/test_grok.py	2007-08-24 11:46:06 UTC (rev 79220)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/test_grok.py	2007-08-24 11:47:04 UTC (rev 79221)
@@ -32,7 +32,7 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    for name in ['adapter', 'error', 'view', 'event', 'security',
+    for name in ['adapter', 'error', 'view', 'event', 'security', 'catalog',
                  'zcml', 'static', 'utility', 'xmlrpc', 'json', 'container',
                  'traversal', 'form', 'site', 'grokker', 'directive', 'util',
                  'baseclass', 'annotation', 'application']: