Fix setup.py, wrongly merged in 962aff92

Add back egg_test recipe

setup.py

@@ -59,6 +59,7 @@ setup(name=name,
           'dropbear.client = slapos.recipe.dropbear:Client',
           'dropbear = slapos.recipe.dropbear:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
+          'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
           'equeue = slapos.recipe.equeue:Recipe',
           'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
           'erp5.promise = slapos.recipe.erp5_promise:Recipe',

software/slapos-testing/instance.cfg

@@ -47,4 +47,4 @@ environment = environment
 [environment]
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
-PYTHONPATH = ${setuptools:location}
+PYTHONPATH = ${python-setuptools:location}

software/slapos-testing/software.cfg

@@ -6,7 +6,7 @@ extends =
   ../../component/libxml2/buildout.cfg
   ../../component/libxslt/buildout.cfg
   ../../component/python-2.7/buildout.cfg
-  ../../component/setuptools/buildout.cfg
+  ../../component/python-setuptools/buildout.cfg
   ../../component/zlib/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -67,6 +67,6 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = d233cfac7c71e8b8fa4bd9f1a7fe58ee 
+md5sum = 97a6ed2faa674819020cfc77ed64cbb0 
 output =  ${buildout:directory}/template.cfg
 mode = 640