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>

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4ed9646..0bb1e6e 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -201,7 +201,7 @@ class TempestCommon(singlevm.VmReady2):
                "/ {print $2}'")
         proc = subprocess.Popen(cmd, shell=True,
                                 stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                stderr=subprocess.DEVNULL)
         verifier_uuid = proc.stdout.readline().rstrip()
         return verifier_uuid.decode("utf-8")
 

diff --git a/tox.ini b/tox.ini
index f02ff3a..466c415 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py27,py38,cover,perm
+envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py38,cover,perm
 
 [testenv]
 usedevelop = True

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 7fa6fa2..3becdb4 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -21,7 +21,7 @@ bandit===1.1.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest#egg=tempest
 git+https://opendev.org/openstack/rally.git#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git@e62608d35302ed3c0aeb31784ce5f4535c9e5fab#egg=rally-openstack
+git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes
 git+https://github.com/esnme/ultrajson@d25e024f481c5571d15f3c0c406a498ca0467cfd#egg=ujson
 pylint===1.9.5;python_version=='2.7'