From 27c0d0f0743c933b5c6efde72cffc0e8f0f05dcd Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 21 Jun 2016 20:06:36 +0200 Subject: [PATCH] move attic test dependency into own file so you can just empty that file to remove the attic-based tests when testing in a OpenSSL 1.1 environment. --- requirements.d/attic.txt | 5 +++++ tox.ini | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 requirements.d/attic.txt diff --git a/requirements.d/attic.txt b/requirements.d/attic.txt new file mode 100644 index 00000000..b5068ffd --- /dev/null +++ b/requirements.d/attic.txt @@ -0,0 +1,5 @@ +# Please note: +# attic only builds using OpenSSL 1.0.x, it can not be installed using OpenSSL >= 1.1.0. +# If attic is not installed, our unit tests will just skip the tests that require attic. +attic + diff --git a/tox.ini b/tox.ini index 0473cb27..c7b49bca 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ envlist = py{34,35},flake8 changedir = {toxworkdir} deps = -rrequirements.d/development.txt - attic + -rrequirements.d/attic.txt commands = py.test --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} # fakeroot -u needs some env vars: passenv = *