[Checkins] SVN: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/ made tests for shared builds stronger by replacing some ellipses with an re normalizer

[Thomas Lotze]

Log message for revision 119628:
  made tests for shared builds stronger by replacing some ellipses with an re normalizer

Changed:
  U   zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt
  U   zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/tests.py

-=-
Modified: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt
===================================================================
--- zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt	2011-01-18 01:18:36 UTC (rev 119627)
+++ zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt	2011-01-18 06:37:17 UTC (rev 119628)
@@ -23,7 +23,7 @@
     >>> print system('bin/buildout')
     Installing foo.
     foo: Unpacking and configuring
-    configuring foo /cache/cmmi/build/...
+    configuring foo /cache/cmmi/build/<BUILDID>
     echo building foo
     building foo
     echo installing foo
@@ -47,7 +47,7 @@
 configuration options (but it can also be configured manually, see below):
 
     >>> ls(cache, 'cmmi', 'build')
-    d  ...
+    d  <BUILDID>
 
 For example, if the download url changes, the build is executed again:
 
@@ -71,7 +71,7 @@
     >>> print system('bin/buildout')
     Installing qux.
     qux: Unpacking and configuring
-    configuring foo /cache/cmmi/build/...
+    configuring foo /cache/cmmi/build/<BUILDID>
     echo building foo
     building foo
     echo installing foo
@@ -80,8 +80,8 @@
 and another shared directory is created:
 
     >>> ls(cache, 'cmmi', 'build')
-    d  ...
-    d  ...
+    d  <BUILDID>
+    d  <BUILDID>
 
 (Other recipes can retrieve the shared build directory from our part's
 `location` as usual, so the SHA-names shouldn't be a problem.)
@@ -216,7 +216,7 @@
     >>> print system('bin/buildout')
     Installing foo.
     foo: Unpacking and configuring
-    configuring foo /cache/cmmi/build/...
+    configuring foo /cache/cmmi/build/<BUILDID>
     echo building foo
     building foo
     echo installing foo
@@ -242,7 +242,7 @@
     Uninstalling foo.
     Installing foo.
     foo: Unpacking and configuring
-    configuring foo /cache/cmmi/build/...
+    configuring foo /cache/cmmi/build/<BUILDID>
     echo building foo
     building foo
     echo installing foo

Modified: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/tests.py
===================================================================
--- zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/tests.py	2011-01-18 01:18:36 UTC (rev 119627)
+++ zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/tests.py	2011-01-18 06:37:17 UTC (rev 119628)
@@ -114,7 +114,8 @@
                normalize_bang,
                (re.compile('http://localhost:[0-9]{4,5}/'),
                 'http://localhost/'),
-               (re.compile('extdemo[.]pyd'), 'extdemo.so')
+               (re.compile('extdemo[.]pyd'), 'extdemo.so'),
+               (re.compile('[0-9a-f]{40}'), '<BUILDID>'),
                ]),
             optionflags = doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE
             ),