summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 18:04:07 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 18:04:07 +0000
commit4788f49ec0957211f1e72d0909ad5a0b76cb3acd (patch)
tree3a72a42329e4be8c275aef3cda5dbb5b9cadbdb4
parent32bfe7808f7c988c1d1b9acccd6fd437894c6e3d (diff)
parented77ce858d1d6824519ed5f33b68c546de0f5ad1 (diff)
Merge "tox: Suppress output"
-rw-r--r--lower-constraints.txt2
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini8
3 files changed, 8 insertions, 4 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 44956ce..173a299 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -26,7 +26,7 @@ six==1.10.0
26snowballstemmer==1.2.1 26snowballstemmer==1.2.1
27Sphinx==1.6.5 27Sphinx==1.6.5
28sphinxcontrib-websupport==1.0.1 28sphinxcontrib-websupport==1.0.1
29stestr==2.0.0 29stestr==2.1.0
30testrepository==0.0.18 30testrepository==0.0.18
31testresources==2.0.0 31testresources==2.0.0
32testscenarios==0.4 32testscenarios==0.4
diff --git a/test-requirements.txt b/test-requirements.txt
index 65f627c..70e4ca0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
6hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 6hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
7mock>=2.0.0 # BSD 7mock>=2.0.0 # BSD
8six>=1.10.0 # MIT 8six>=1.10.0 # MIT
9stestr>=2.0.0 # Apache-2.0 9stestr>=2.1.0 # Apache-2.0
10testresources>=2.0.0 # Apache-2.0/BSD 10testresources>=2.0.0 # Apache-2.0/BSD
11testscenarios>=0.4 # Apache-2.0/BSD 11testscenarios>=0.4 # Apache-2.0/BSD
12testtools>=2.2.0 # MIT 12testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index d97e6ff..4d460d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,11 +5,15 @@ envlist = py{27,35,36},pep8,docs
5[testenv] 5[testenv]
6usedevelop = True 6usedevelop = True
7install_command = pip install {opts} {packages} 7install_command = pip install {opts} {packages}
8passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE 8passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS
9setenv =
10 OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:1}
11 OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:1}
12 OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:60}
9deps = 13deps =
10 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 14 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
11 -r{toxinidir}/test-requirements.txt 15 -r{toxinidir}/test-requirements.txt
12commands = stestr run {posargs} 16commands = stestr run --suppress-attachments {posargs}
13 17
14[testenv:pep8] 18[testenv:pep8]
15basepython = python3 19basepython = python3