Fix tests.

README.rst

@@ -157,7 +157,6 @@ Then let's run the buildout::
 Let's take a look at the buildout parts directory now::
 
   >>> ls(sample_buildout, 'parts')
-  d buildout
   d git-clone
 
 When updating, it will do a "git fetch; git reset @{upstream}"::
@@ -195,7 +194,6 @@ Then let's run the buildout::
 Let's take a look at the buildout parts directory now::
 
   >>> ls(sample_buildout, 'parts')
-  d buildout
   d git-clone
 
 And let's see that current branch is "build"::
@@ -242,7 +240,6 @@ Then let's run the buildout::
 Let's take a look at the buildout parts directory now::
 
   >>> ls(sample_buildout, 'parts')
-  d buildout
   d git-clone
 
 And let's see that current revision is "2566127"::
@@ -257,8 +254,13 @@ When updating, it will do a "git fetch; git reset revision"::
   >>> cd(sample_buildout)
   >>> print system(buildout)
   Updating git-clone.
-  Fetching origin
-  HEAD is now at 2566127 ...
+  ...
+  HEAD is now at 2566127 ... 
+  Not found: ...
+  Not found: ...
+  Not found: ...
+  Not found: ...
+  <BLANKLINE>
 
 Empty revision/branch
 ~~~~~~~~~~~~~~~~~~~~~
@@ -367,6 +369,10 @@ repository::
   >>> cd(sample_buildout)
   >>> print system(buildout)
   Updating git-clone.
+  Fetching origin
+  ...
+  <BLANKLINE>
+
 
   >>> cd(sample_buildout, 'parts', 'git-clone')
   >>> print system('cat setup.py')
@@ -383,6 +389,18 @@ Then, when update occurs, nothing is done::
   >>> cd(sample_buildout)
   >>> print system(buildout)
   Updating git-clone.
+  Fetching origin
+  Fetching broken
+  Unable to update:
+  Traceback (most recent call last):
+  ...
+  CalledProcessError: Command '['git', 'fetch', '--all']' returned non-zero exit status 1
+  <BLANKLINE>
+  ...
+  fatal: unable to access 'http://git.erp5.org/repos/nowhere/': The requested URL returned error: 500
+  error: Could not fetch broken
+  <BLANKLINE> 
+  
   >>> cd(sample_buildout, 'parts', 'git-clone')
   >>> print system('cat local_change')
   kept
@@ -409,6 +427,8 @@ In case of uninstall, buildout will keep the repository directory::
   You have uncommited changes in /sample-buildout/parts/git-clone. This folder will be left as is.
   Installing git-clone.
   destination directory already exists.
+  ...
+  <BLANKLINE>
 
 Specific git binary
 ~~~~~~~~~~~~~~~~~~~

slapos/recipe/build/tests.py

-from zope.testing import doctest
+import doctest
 from zope.testing import renormalizing
 
 import os