From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 8 Dec 2020 22:27:04 +0000 (+0100)
Subject: Rather use rconfig.has_option() instead
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F71679%2F1;p=functest.git

Rather use rconfig.has_option() instead

It slightly increases py2 and py3 to ease next backports.

Change-Id: I168044d85469e92f970e983f4bdfe627d3763e61
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 859359c0a4b2afce87beb8ad34fb72c1e3241d4b)
---

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index ce1fcedd2..3258cc5c4 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -493,7 +493,7 @@ class TempestCommon(singlevm.VmReady2):
             rconfig.add_section("auth")
         if env.get("NEW_USER_ROLE").lower() != "member":
             tempest_roles = []
-            if "tempest_roles" in rconfig["auth"]:
+            if rconfig.has_option("auth", "tempest_roles"):
                 tempest_roles = functest_utils.convert_ini_to_list(
                     rconfig.get("auth", "tempest_roles"))
             rconfig.set(