From ce5b669f9fedf1c20b342f185ed397c38a17917a Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 17 May 2019 21:26:03 -0500 Subject: [PATCH] - add dedicated ZServer test configuration --- .travis.yml | 2 ++ buildout.cfg | 7 +++++++ tox.ini | 16 ++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/.travis.yml b/.travis.yml index 33ecacd249..d91fc020d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ matrix: env: TOXENV=lint-py36 - python: "2.7" env: TOXENV=py27 + - python: "2.7" + env: TOXENV=py27-zserver - python: "3.5" env: TOXENV=py35 - python: "3.6" diff --git a/buildout.cfg b/buildout.cfg index fc59f89afd..8772c0fbfc 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -12,6 +12,7 @@ parts = zserverscripts zopescripts alltests + zservertests ztktests allpy sphinx @@ -78,6 +79,12 @@ eggs = Record +[zservertests] +<= alltests +script = zservertests +eggs += ZServer + + [ztktests] recipe = zc.recipe.testrunner script = ztktests diff --git a/tox.ini b/tox.ini index d1964cc4de..6735fc93ea 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] envlist = py27, + py27-zserver, py35, py36, py37, @@ -23,6 +24,21 @@ deps = setenv = COVERAGE_FILE=.coverage.{envname} +[testenv:py27-zserver] +coverage_run = {env:WIN_COV:coverage run} +commands = + {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap + {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install zservertests + {[testenv]coverage_run} {envdir}/bin/zservertests {posargs:-vc} +skip_install = true +deps = + -cconstraints.txt + coverage + setuptools>=36.2 + zc.buildout>=2.12 +setenv = + COVERAGE_FILE=.coverage.{envname} + [testenv:coverage-report] basepython = python3.6 deps =