Update tests to groktoolkit 1.3, temporarily use distribute instead o…

…f setuptools.

tests_paste.txt

@@ -11,15 +11,16 @@ Then use paster. Eggs are placed in our freshly created eggs directory:
     >>> # Use a specific grok version, because 'current' will change at some
     >>> # point in the future.
     >>> executable = [os.path.join(current_dir, 'bin', 'grokproject')]
-    >>> opts = ['--user=a', '--passwd=a', '--eggs-dir=' + eggsdir]
+    >>> opts = ['--use-distribute=True', '--user=a', '--passwd=a', '--eggs-dir=' + eggsdir]
     >>> version = [
-    ... '--version-url=http://grok.zope.org/releaseinfo/1.2.1/versions.cfg']
+    ... '--version-url=http://grok.zope.org/releaseinfo/1.3/versions.cfg']
     >>> sh(executable + opts + version + ['GrokExample'])
     ['...grokproject',
+     '--use-distribute=True',
      '--user=a',
      '--passwd=a',
      '--eggs-dir=...grokproject-test-eggs',
-     '--version-url=http://grok.zope.org/releaseinfo/1.2.1/versions.cfg',
+     '--version-url=http://grok.zope.org/releaseinfo/1.3/versions.cfg',
      'GrokExample']...
     Creating directory '...bin'.
     Creating directory '...parts'.
@@ -71,16 +72,14 @@ Let's check the contents:
     >>> 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.2.1/versions.cfg
-    ...
+    extends = http://grok.zope.org/releaseinfo/1.3/versions.cfg
     extends-cache = extends-cache
     include-site-packages = false
     develop = .
     ...
 
     >>> ls(package_dir)
     .installed.cfg
-    .mr.developer.cfg
     bin
     bootstrap.py
     buildout.cfg
@@ -107,7 +106,6 @@ Let's check the contents:
     >>> ls(bin_dir)
     buildout
     daemon
-    develop
     i18ncompile
     i18nextract
     i18nmergeall
@@ -142,12 +140,12 @@ The eggs dir is filled now:
 
 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.2.1 will look like:
+cached versions file for 1.3 will look like:
 
-    <<< ls(os.path.join(package_dir, 'extends-cache'))
-    1db36734c0226e6f922ac9bb3361f6d8
-    286c4c832f552bec68fcac956a6be5c6
-    2a2cf1415ca2d47decad204083d1482c
+    >>> ls(os.path.join(package_dir, 'extends-cache'))
+    0e528124e9df4d3fad02dfc68147586e
+    354ba68f51f74190b8bfdc3d2686b6fb
+    b88291ed0762c9dcbc55c7a7c7176bb1
 
 The password given is stored SSHA encoded:
 
@@ -289,9 +287,7 @@ first:
     >>> cd(package_dir)
     >>> cmd = os.path.join(bin_dir, 'buildout')
     >>> output = read_sh(cmd)
-    >>> print 'Test\n', output
-    Test
-    ...
+    >>> print output
     Develop: ...
     Updating app.
     Updating daemon.