Harden tests, make them compatible with new buildout.

README.rst

@@ -92,6 +92,7 @@ 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}"::
@@ -122,19 +123,21 @@ Then let's run the buildout::
 
   >>> print system(buildout)
   Uninstalling git-clone.
+  Running uninstall recipe.
   Installing git-clone.
   Cloning into '/sample-buildout/parts/git-clone'...
 
 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"::
   >>> import subprocess
   >>> cd('parts', 'git-clone')
-  >>> subprocess.check_output(['git', 'branch'])
-  '* build\n'
+  >>> print subprocess.check_output(['git', 'branch'])
+  * build
 
 When updating, it will do a "git fetch; git reset build"::
 
@@ -166,20 +169,22 @@ Then let's run the buildout::
 
   >>> print system(buildout)
   Uninstalling git-clone.
+  Running uninstall recipe.
   Installing git-clone.
   Cloning into '/sample-buildout/parts/git-clone'...
 
 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 "gitclone"::
+And let's see that current revision is "2566127"::
 
   >>> import subprocess
   >>> cd(sample_buildout, 'parts', 'git-clone')
-  >>> subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'])
-  '2566127\n'
+  >>> print subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'])
+  2566127
 
 When updating, it will do a "git fetch; git reset revision"::
 
@@ -187,7 +192,8 @@ When updating, it will do a "git fetch; git reset revision"::
   >>> print system(buildout)
   Updating git-clone.
   Fetching origin
-  HEAD is now at ...
+  HEAD is now at 2566127 ...
+
 Empty revision/branch
 ---------------------