aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-03-22 13:13:53 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-03-23 18:00:30 +0100
commitf367ec8b70f31f81646e87af1c8ef05d01a08768 (patch)
tree55dfb6b6495341672fb492d4fb3811797ac5885c
parente8e5cad2e7b1a06662c095384d731631bde7c322 (diff)
Doesn't redirect stderr when getting verifier id
The logic fails when rally produces warnings [1]. It also updates Rally OpenStack and checks if the previous error has been solved[2]. TypeError: _discover_or_create_flavor() missing 1 required positional argument: 'flv_disk' [3] [1] https://build.opnfv.org/ci/job/functest-opnfv-functest-healthcheck-latest-tempest_smoke-run/757/console [2] https://github.com/openstack/rally-openstack/commit/e62315115af20e53f6c7205494ba0008634047ed [3] https://build.opnfv.org/ci/job/functest-opnfv-functest-healthcheck-latest-tempest_smoke-run/629/console Change-Id: Ia1daaa76d7cef7f30904c1f3bd42e2f6a6ba10af Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 62f33836dfb2d24650ec7474d532e304d5d537f6)
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4ed964644..6abc72f4f 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -21,6 +21,7 @@ import subprocess
import time
import pkg_resources
+import six
from six.moves import configparser
from xtesting.core import testcase
import yaml
@@ -199,9 +200,15 @@ class TempestCommon(singlevm.VmReady2):
cmd = ("rally verify list-verifiers | awk '/" +
getattr(config.CONF, 'tempest_verifier_name') +
"/ {print $2}'")
- proc = subprocess.Popen(cmd, shell=True,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
+ if six.PY3:
+ proc = subprocess.Popen(
+ cmd, shell=True, stdout=subprocess.PIPE,
+ stderr=subprocess.DEVNULL)
+ else:
+ with open(os.devnull, 'wb') as devnull:
+ proc = subprocess.Popen(
+ cmd, shell=True, stdout=subprocess.PIPE,
+ stderr=devnull)
verifier_uuid = proc.stdout.readline().rstrip()
return verifier_uuid.decode("utf-8")