From db2565d59129e6d0183dbe7351f301f173644bd5 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Fri, 20 Jul 2018 18:42:28 +0200 Subject: [PATCH] slapos-testing: Start to test slapos.libnetworkcache --- software/slapos-testing/buildout.hash.cfg | 2 +- software/slapos-testing/instance.cfg | 6 +++++- software/slapos-testing/software.cfg | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/software/slapos-testing/buildout.hash.cfg b/software/slapos-testing/buildout.hash.cfg index 85f5a5da7..78e5e7127 100644 --- a/software/slapos-testing/buildout.hash.cfg +++ b/software/slapos-testing/buildout.hash.cfg @@ -15,5 +15,5 @@ [template] filename = instance.cfg -md5sum = 37f6d8cfa54e8dacf04f13327caac208 +md5sum = d361db5f94e8c568e2aa44014d0ba91b diff --git a/software/slapos-testing/instance.cfg b/software/slapos-testing/instance.cfg index 6d20e06e4..dff552001 100644 --- a/software/slapos-testing/instance.cfg +++ b/software/slapos-testing/instance.cfg @@ -30,6 +30,10 @@ git-executable = ${git:location}/bin/git <= download-source repository = ${caucase-repository:location} +[slapos.libnetworkcache] +<= download-source +repository = ${slapos.libnetworkcache-repository:location} + [erp5.util] <= download-source repository = ${erp5.util-repository:location} @@ -65,7 +69,7 @@ wrapper-path = $${create-directory:bin}/runTestSuite command-line = ${buildout:bin-directory}/runTestSuite --python_interpreter=${buildout:bin-directory}/${eggs:interpreter} - --source_code_path_list=$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location} + --source_code_path_list=$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location} # Notes about environment: # * slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg index b456c80c3..45f376317 100644 --- a/software/slapos-testing/software.cfg +++ b/software/slapos-testing/software.cfg @@ -34,6 +34,11 @@ recipe = zc.recipe.egg:develop egg = caucase setup = ${caucase-repository:location} +[slapos.libnetworkcache-setup] +<= setup-develop-egg +egg = slapos.libnetworkcache +setup = ${slapos.libnetworkcache-repository:location} + [erp5.util-setup] <= setup-develop-egg # XXX erp5.util does not have `test` extra require, but has a `testnode` extra require with same dependencies @@ -96,6 +101,7 @@ eggs = ${slapos.recipe.cmmi-setup:egg} ${slapos.recipe.template-setup:egg} ${slapos.toolbox-setup:egg} + ${slapos.libnetworkcache-setup:egg} mock zope.testing httmock @@ -133,6 +139,10 @@ repository = https://lab.nexedi.com/nexedi/slapos.core.git <= git-clone-repository repository = https://lab.nexedi.com/nexedi/slapos.recipe.template.git +[slapos.libnetworkcache-repository] +<= git-clone-repository +repository = https://lab.nexedi.com/nexedi/slapos.libnetworkcache.git + [slapos.recipe.build-repository] <= git-clone-repository repository = https://lab.nexedi.com/nexedi/slapos.recipe.build.git -- 2.30.9