From 94e3a65b4f1c91926fec609155c11b99d21f23e8 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Sat, 25 Aug 2012 01:40:00 +0900
Subject: [PATCH] Fix and adjust the SR to run tests.
---
software/slapos-testing/instance.cfg | 8 ++++----
software/slapos-testing/software.cfg | 23 ++++++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/software/slapos-testing/instance.cfg b/software/slapos-testing/instance.cfg
index 0582d7984..f571430cd 100644
--- a/software/slapos-testing/instance.cfg
+++ b/software/slapos-testing/instance.cfg
@@ -8,7 +8,7 @@ offline = true
[download-source]
recipe = plone.recipe.command
-location = $${rootdirectory:source-code}/${:_buildout_section_name_}
+location = $${rootdirectory:source-code}/$${:_buildout_section_name_}
stop-on-error = true
branch = master
revision =
@@ -40,7 +40,7 @@ test-list = $${slapos.recipe.template:location},$${slapos.core:location}
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-srv = ${buildout:directory}/srv
+etc = $${buildout:directory}/etc
+srv = $${buildout:directory}/srv
source-code = $${:srv}/eggs-source-code
-bin = ${buildout:directory}/bin
+bin = $${buildout:directory}/bin
diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg
index 03f5ead66..5fc102338 100644
--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
@@ -1,27 +1,36 @@
[buildout]
extends = ../../stack/slapos.cfg
+ ../../component/lxml-python/buildout.cfg
../../component/git/buildout.cfg
-parts = runTestSuite
+parts = erp5.util-repository
+ slapos.cookbook-repository
+ runTestSuite
+ eggs
slapos.core-repository
slapos.recipe.template-repository
template
-develop = ${buildout:parts-directory}/parts/erp5.util-repository
- ${buildout:parts-directory}/parts/erp5.cookbook-repository
-
+develop = ${buildout:parts-directory}/erp5.util-repository
+ ${buildout:parts-directory}/slapos.cookbook-repository
[erp5.util-repository]
<= download-source
repository = http://git.erp5.org/repos/erp5.git
-branch = for_test_runner_1
+branch = for_testrunner_1
-[erp5.cookbook-repository]
+[slapos.cookbook-repository]
<= download-source
repository = http://git.erp5.org/repos/slapos.git
branch = slapos-testing
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+ ${lxml-python:egg}
+ slapos.cookbook
+
[runTestSuite]
recipe = zc.recipe.egg
@@ -54,6 +63,6 @@ repository = http://git.erp5.org/repos/slapos.recipe.template.git
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
-md5sum = 1382838589e31ebfcba4420d9c7d42d9
+md5sum = d2a167a6441d5170a027b3771932fe7f
output = ${buildout:directory}/template.cfg
mode = 640
--
2.30.9