[Checkins] SVN: zc.buildout/branches/help-api/ - added a test to proove that the 1.0.5 release breakage as of

[Godefroid Chapelle]

Log message for revision 98495:
  - added a test to proove that the 1.0.5 release breakage as of
    https://bugs.launchpad.net/zc.buildout/+bug/239212 is indeed solved
    in trunk
  
  - fixed the test for the += -= syntax change.

Changed:
  U   zc.buildout/branches/help-api/CHANGES.txt
  U   zc.buildout/branches/help-api/src/zc/buildout/allowhosts.txt
  U   zc.buildout/branches/help-api/src/zc/buildout/buildout.txt

-=-
Modified: zc.buildout/branches/help-api/CHANGES.txt
===================================================================
--- zc.buildout/branches/help-api/CHANGES.txt	2009-03-29 21:20:02 UTC (rev 98494)
+++ zc.buildout/branches/help-api/CHANGES.txt	2009-03-29 21:20:09 UTC (rev 98495)
@@ -7,6 +7,14 @@
 1.0.6 (unreleased)
 ==================
 
+- fixed the test for the += -= syntax in buildout.txt as the test
+  was actually wronng. The original implementation did a split/join
+  on whitespace, and later on that was corrected to respect the original
+  EOL setting, the test was not updated, though. (seletz)
+
+- added a test to verify against https://bugs.launchpad.net/zc.buildout/+bug/239212
+  in allowhosts.txt (seletz)
+
 - further fixes for """AttributeError: Buildout instance has no 
   attribute '_logger'""" by providing reasonable defaults 
   within the Buildout constructor (related to the new 'allow-hosts' option)

Modified: zc.buildout/branches/help-api/src/zc/buildout/allowhosts.txt
===================================================================
--- zc.buildout/branches/help-api/src/zc/buildout/allowhosts.txt	2009-03-29 21:20:02 UTC (rev 98494)
+++ zc.buildout/branches/help-api/src/zc/buildout/allowhosts.txt	2009-03-29 21:20:09 UTC (rev 98495)
@@ -106,4 +106,32 @@
     Error: Couldn't find a distribution for 'kss.core'.
     <BLANKLINE>
 
+Test for issues
+---------------
 
+Test for 1.0.5 breakage as in https://bugs.launchpad.net/zc.buildout/+bug/239212::
+
+    >>> write(sample_buildout, 'buildout.cfg',
+    ... '''
+    ... [buildout]
+    ... parts=
+    ...     python
+    ...      
+    ... foo = ${python:interpreter}
+    ...      
+    ... [python]
+    ... recipe=zc.recipe.egg
+    ... eggs=ipython
+    ... interpreter=python
+    ... ''')
+    >>> print system(buildout)
+    Unused options for buildout: 'foo'.
+    Installing python.
+    Getting distribution for 'ipython'.
+    Got ipython 0.8.3.
+    Generated script 'bin/ipython'.
+    Generated script 'bin/pycolor'.
+    Generated interpreter 'bin/python'.
+    <BLANKLINE>
+
+The bug 239212 above would have got us an *AttrubuteError* on *buildout._allow_hosts*.

Modified: zc.buildout/branches/help-api/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/branches/help-api/src/zc/buildout/buildout.txt	2009-03-29 21:20:02 UTC (rev 98494)
+++ zc.buildout/branches/help-api/src/zc/buildout/buildout.txt	2009-03-29 21:20:09 UTC (rev 98495)
@@ -905,23 +905,23 @@
 
 This is illustrated below; first we define a base configuration.
 
-    >>> write(sample_buildout, 'base.cfg',  
+    >>> write(sample_buildout, 'base.cfg',
     ... """
     ... [buildout]
     ... parts = part1 part2 part3
     ...
     ... [part1]
-    ... recipe = 
+    ... recipe =
     ... option = a1 a2
     ...
     ... [part2]
-    ... recipe = 
+    ... recipe =
     ... option = b1 b2 b3 b4
-    ... 
+    ...
     ... [part3]
-    ... recipe = 
+    ... recipe =
     ... option = c1 c2
-    ... 
+    ...
     ... """)
 
 Extending this configuration, we can "adjust" the values set in the
@@ -966,10 +966,10 @@
     ... option -= b1 b2 b3
     ...
     ... """)
-    
+
 To verify that the options are adjusted correctly, we'll set up an
 extension that prints out the options.
-    
+
     >>> mkdir(sample_buildout, 'demo')
     >>> write(sample_buildout, 'demo', 'demo.py',
     ... """
@@ -994,7 +994,7 @@
     ... """
     ... [buildout]
     ... develop = demo
-    ... parts = 
+    ... parts =
     ... """)
 
     >>> os.chdir(sample_buildout)
@@ -1016,9 +1016,9 @@
     ... extensions = demo
     ... extends = extension2.cfg
     ... """)
-    
+
     >>> print system(os.path.join('bin', 'buildout')),
-    ['a1/na2/na3/na4/na5', 'b4', 'c1/nc2/nc3/nc4/nc5', 'h1 h2']
+    ['a1 a2/na3 a4/na5', 'b1 b2 b3 b4', 'c1 c2/nc3 c4 c5', 'h1 h2']
     Develop: '/sample-buildout/demo'
 
 Cleanup.
@@ -1026,7 +1026,7 @@
     >>> os.remove(os.path.join(sample_buildout, 'base.cfg'))
     >>> os.remove(os.path.join(sample_buildout, 'extension1.cfg'))
     >>> os.remove(os.path.join(sample_buildout, 'extension2.cfg'))
-    
+
 Multiple configuration files
 ----------------------------