Fix tests by following renaming.

slapos/rebootstrap/default.txt

@@ -62,7 +62,7 @@ Develop: '/sample-buildout/recipes'
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -80,12 +80,12 @@ Develop: '/sample-buildout/recipes'
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
 Creating directory '/sample-buildout/rebootstrap.1.parts'.
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/bin/installpython

slapos/rebootstrap/extensionsupport.txt

@@ -68,7 +68,7 @@ Develop: '/sample-buildout/recipes'
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap recipes
+... extensions = slapos.rebootstrap recipes
 ...
 ... parts =
 ...   realrun
@@ -86,13 +86,13 @@ Develop: '/sample-buildout/recipes'
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=recipes', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=recipes', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
 Special extension run
 Creating directory '/sample-buildout/rebootstrap.1.parts'.
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/bin/installpython

slapos/rebootstrap/partsexists.txt

@@ -62,7 +62,7 @@ Develop: '/sample-buildout/recipes'
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -82,11 +82,11 @@ Develop: '/sample-buildout/recipes'
 >>> import os
 >>> os.mkdir('rebootstrap.1.parts')
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/bin/installpython

slapos/rebootstrap/tests.py

@@ -23,7 +23,7 @@ import zc.buildout.tests
 
 def setUp(test):
   zc.buildout.testing.buildoutSetUp(test)
-  zc.buildout.testing.install_develop('slapos.tool.rebootstrap', test)
+  zc.buildout.testing.install_develop('slapos.rebootstrap', test)
 
 def test_suite():
   # Note: Doctests are used, as this is the good way to test zc.buildout based

slapos/rebootstrap/upgrade.txt

@@ -62,7 +62,7 @@ Develop: '/sample-buildout/recipes'
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -80,12 +80,12 @@ Develop: '/sample-buildout/recipes'
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.1.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
 Creating directory '/sample-buildout/rebootstrap.1.parts'.
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/bin/installpython
@@ -102,7 +102,7 @@ Running with: /sample_buildout/rebootstrap.1.parts/installpython/bin/installpyth
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -120,12 +120,12 @@ Running with: /sample_buildout/rebootstrap.1.parts/installpython/bin/installpyth
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.2.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.2.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.2.parts', 'buildout:installed=.rebootstrap.2.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.2.parts/installpython/bin/installpython' in '/sample-buildout/rebootstrap.2.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.2.parts', 'buildout:installed=.rebootstrap.2.installed.cfg'].
 Creating directory '/sample-buildout/rebootstrap.2.parts'.
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.2.parts/installpython/bin/installpython
@@ -142,7 +142,7 @@ Running with: /sample_buildout/rebootstrap.2.parts/installpython/bin/installpyth
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -160,7 +160,7 @@ Running with: /sample_buildout/rebootstrap.2.parts/installpython/bin/installpyth
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/bin/installpython

slapos/rebootstrap/withownpython.txt

@@ -63,7 +63,7 @@ Develop: '/sample-buildout/recipes'
 ... """
 ... [buildout]
 ... develop = recipes
-... extensions = slapos.tool.rebootstrap
+... extensions = slapos.rebootstrap
 ...
 ... parts =
 ...   realrun
@@ -84,12 +84,12 @@ Develop: '/sample-buildout/recipes'
 ... recipe = recipes:pyshow
 ... """ % dict(syspython=sys.executable))
 >>> print system(buildout),
-slapos.tool.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/anotherpython' in '/sample-buildout/rebootstrap.1.parts'
-slapos.tool.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
+slapos.rebootstrap: Installing section 'installpython' to provide '/sample-buildout/rebootstrap.1.parts/installpython/anotherpython' in '/sample-buildout/rebootstrap.1.parts'
+slapos.rebootstrap: Rerunning buildout to install section installpython with arguments ['/sample-buildout/bin/buildout', 'buildout:parts=installpython', 'buildout:extensions=', '/sample-buildout/rebootstrap.1.parts', 'buildout:installed=.rebootstrap.1.installed.cfg'].
 Creating directory '/sample-buildout/rebootstrap.1.parts'.
 Develop: '/sample-buildout/recipes'
 Installing installpython.
-slapos.tool.rebootstrap: 
+slapos.rebootstrap: 
 ************ REBOOTSTRAP: IMPORTANT NOTICE ************
 bin/buildout is being reinstalled right now, as new python:
   /sample_buildout/rebootstrap.1.parts/installpython/anotherpython