[Checkins] SVN: grokproject/trunk/ Fix tests.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Mon Jan 3 06:18:52 EST 2011
Log message for revision 119291:
Fix tests.
Changed:
U grokproject/trunk/grokproject/template/buildout.cfg_tmpl
U grokproject/trunk/grokproject/template/src/+package+/app.txt_tmpl
U grokproject/trunk/grokproject/template/src/+package+/app_templates/index.pt_tmpl
U grokproject/trunk/tests_paste.txt
-=-
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2011-01-03 11:04:40 UTC (rev 119290)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2011-01-03 11:18:52 UTC (rev 119291)
@@ -1,6 +1,5 @@
[buildout]
extends = ${version_info_url}
-extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
extends-cache = extends-cache
include-site-packages = ${include_site_packages}
develop = .
@@ -53,11 +52,16 @@
grokcore.traverser = svn http://svn.zope.org/repos/main/grokcore.traverser/trunk
[versions]
+# Override versions here.
+# This version pin can be removed after the next groktoolkit release.
WebOb = 1.0
zope.app.wsgi = 3.10.0
-# Override versions here.
-# This version pin can be removed after the next groktoolkit release.
-collective.recipe.scriptgen = 0.2
+martian = 0.14
+grokcore.json = 1.1
+grokcore.component = 2.2
+grokcore.content = 1.1
+grokcore.security = 1.5
+grokcore.viewlet = 1.8
[app]
recipe = z3c.recipe.scripts
Modified: grokproject/trunk/grokproject/template/src/+package+/app.txt_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/src/+package+/app.txt_tmpl 2011-01-03 11:04:40 UTC (rev 119290)
+++ grokproject/trunk/grokproject/template/src/+package+/app.txt_tmpl 2011-01-03 11:18:52 UTC (rev 119291)
@@ -29,10 +29,6 @@
>>> print browser.contents
<html>
<head>
- <link rel="stylesheet" type="text/css"
- href="http://localhost/fanstatic/${project_lowercase}/style.css" />
- <script type="text/javascript"
- src="http://localhost/fanstatic/${project_lowercase}/hello.js"></script>
<base href="http://localhost/app/@@index" />
<BLANKLINE>
</head>
Modified: grokproject/trunk/grokproject/template/src/+package+/app_templates/index.pt_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/src/+package+/app_templates/index.pt_tmpl 2011-01-03 11:04:40 UTC (rev 119290)
+++ grokproject/trunk/grokproject/template/src/+package+/app_templates/index.pt_tmpl 2011-01-03 11:18:52 UTC (rev 119291)
@@ -7,7 +7,6 @@
<p>Your Grok application is up and running.
Edit <code>${package}/app_templates/index.pt</code> to change
this page.</p>
-
<img tal:attributes="src static/evencaveman.jpg"/>
</body>
</html>
Modified: grokproject/trunk/tests_paste.txt
===================================================================
--- grokproject/trunk/tests_paste.txt 2011-01-03 11:04:40 UTC (rev 119290)
+++ grokproject/trunk/tests_paste.txt 2011-01-03 11:18:52 UTC (rev 119291)
@@ -13,13 +13,13 @@
>>> executable = [os.path.join(current_dir, 'bin', 'grokproject')]
>>> opts = ['--user=a', '--passwd=a', '--eggs-dir=' + eggsdir]
>>> version = [
- ... '--version-url=http://grok.zope.org/releaseinfo/1.2b/versions.cfg']
+ ... '--version-url=http://grok.zope.org/releaseinfo/1.2.1/versions.cfg']
>>> sh(executable + opts + version + ['GrokExample'])
['...grokproject',
'--user=a',
'--passwd=a',
'--eggs-dir=...grokproject-test-eggs',
- '--version-url=http://grok.zope.org/releaseinfo/1.2b/versions.cfg',
+ '--version-url=http://grok.zope.org/releaseinfo/1.2.1/versions.cfg',
'GrokExample']...
Creating directory '...bin'.
Creating directory '...parts'.
@@ -71,7 +71,7 @@
>>> package_dir = os.path.join(testdir, 'GrokExample')
>>> print open(os.path.join(package_dir, 'buildout.cfg')).read()
[buildout]
- extends = http://grok.zope.org/releaseinfo/1.2b/versions.cfg
+ extends = http://grok.zope.org/releaseinfo/1.2.1/versions.cfg
extends-cache = extends-cache
include-site-packages = false
develop = .
@@ -143,12 +143,12 @@
The extends-cache directive results in cached versions of the referenced
buildout files to support offline building. We know what the filename of the
-cached versions file for 1.2b will look like:
+cached versions file for 1.2.1 will look like:
>>> ls(os.path.join(package_dir, 'extends-cache'))
- 0857a87803d0c8a371e867bd7d58a782
- 1cd99c06b44977edcb9281133f31007b
- f74256c0d403a6bb45c38b9ce42c783c
+ 1db36734c0226e6f922ac9bb3361f6d8
+ 286c4c832f552bec68fcac956a6be5c6
+ 2a2cf1415ca2d47decad204083d1482c
The password given is stored SSHA encoded:
@@ -264,13 +264,13 @@
>>> print 'Test:\n' + output
Test...
Running tests at level 1
- Running grokexample.FanstaticLayer tests:
- Set up grokexample.FanstaticLayer in ... seconds.
+ Running grokexample.ZopeFanstaticBrowserLayer tests:
+ Set up grokexample.ZopeFanstaticBrowserLayer... in ... seconds.
Running:
- ...
- Ran 3 tests with 0 failures and 0 errors in ... seconds.
+ .
+ Ran 1 tests with 0 failures and 0 errors in ... seconds.
Tearing down left over layers:
- Tear down grokexample.FanstaticLayer in ... seconds.
+ Tear down grokexample.ZopeFanstaticBrowserLayer in ... seconds.
<BLANKLINE>
Using the generated `buildout` script
More information about the checkins
mailing list