From ef837051e835774b09f5d396cc20d570710f660b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 4 Jan 2020 22:31:40 +0100 Subject: Update Alpine to 3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also updates Python to 3.8 (default version). It selects arm32v6 et arm64v8 repos and switches multiarch binfmt. https://alpinelinux.org/posts/Alpine-3.11.0-released.html Change-Id: Ib41cf0ab805ce2137658f3ff656b0a88c7b4ebf5 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/vping/vping_userdata.py | 6 +++--- functest/utils/functest_utils.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'functest') diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py index 225c167d5..9010895cb 100644 --- a/functest/opnfv_tests/openstack/vping/vping_userdata.py +++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py @@ -79,13 +79,13 @@ class VPingUserdata(singlevm.VmReady2): self.logger.info("vPing detected!") exit_code = testcase.TestCase.EX_OK break - elif "failed to read iid from metadata" in p_console or tries > 5: + if "failed to read iid from metadata" in p_console or tries > 5: self.logger.info("Failed to read iid from metadata") break - elif sec == getattr(config.CONF, 'vping_ping_timeout'): + if sec == getattr(config.CONF, 'vping_ping_timeout'): self.logger.info("Timeout reached.") break - elif sec % 10 == 0: + if sec % 10 == 0: if "request failed" in p_console: self.logger.debug( "It seems userdata is not supported in nova boot. " diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index a1434adc2..a9c9e5e72 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -207,7 +207,7 @@ def convert_ini_to_dict(value): "Convert oslo.conf input to dict" assert isinstance(value, str) try: - return {k: v for k, v in (x.rsplit(':', 1) for x in value.split(','))} + return dict((x.rsplit(':', 1) for x in value.split(','))) except ValueError: return {} @@ -217,4 +217,4 @@ def convert_ini_to_list(value): assert isinstance(value, str) if not value: return [] - return [x for x in value.split(',')] + return list(value.split(',')) -- cgit 1.2.3-korg