Browse Source

Merge "tox: Suppress output"

tags/5.0.0
Zuul 8 months ago
parent
commit
4788f49ec0
3 changed files with 8 additions and 4 deletions
  1. 1
    1
      lower-constraints.txt
  2. 1
    1
      test-requirements.txt
  3. 6
    2
      tox.ini

+ 1
- 1
lower-constraints.txt View File

@@ -26,7 +26,7 @@ six==1.10.0
26 26
 snowballstemmer==1.2.1
27 27
 Sphinx==1.6.5
28 28
 sphinxcontrib-websupport==1.0.1
29
-stestr==2.0.0
29
+stestr==2.1.0
30 30
 testrepository==0.0.18
31 31
 testresources==2.0.0
32 32
 testscenarios==0.4

+ 1
- 1
test-requirements.txt View File

@@ -6,7 +6,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
6 6
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
7 7
 mock>=2.0.0 # BSD
8 8
 six>=1.10.0 # MIT
9
-stestr>=2.0.0 # Apache-2.0
9
+stestr>=2.1.0 # Apache-2.0
10 10
 testresources>=2.0.0 # Apache-2.0/BSD
11 11
 testscenarios>=0.4 # Apache-2.0/BSD
12 12
 testtools>=2.2.0 # MIT

+ 6
- 2
tox.ini View File

@@ -5,11 +5,15 @@ envlist = py{27,35,36},pep8,docs
5 5
 [testenv]
6 6
 usedevelop = True
7 7
 install_command = pip install {opts} {packages}
8
-passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE
8
+passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS
9
+setenv =
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}
9 13
 deps =
10 14
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
11 15
   -r{toxinidir}/test-requirements.txt
12
-commands = stestr run {posargs}
16
+commands = stestr run --suppress-attachments {posargs}
13 17
 
14 18
 [testenv:pep8]
15 19
 basepython = python3

Loading…
Cancel
Save