From 668f683a8f886c5dbedb5b436a41d605a28d4071 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Thu, 21 Nov 2019 15:45:38 +0100 Subject: [PATCH] cloud/util: make syntax py3 compat Signed-off-by: Kyr Shatskyy --- teuthology/provision/cloud/test/test_cloud_init.py | 2 +- teuthology/provision/cloud/test/test_cloud_util.py | 2 +- teuthology/provision/cloud/util.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/provision/cloud/test/test_cloud_init.py b/teuthology/provision/cloud/test/test_cloud_init.py index 59fe6c5556..fdee723e6c 100644 --- a/teuthology/provision/cloud/test/test_cloud_init.py +++ b/teuthology/provision/cloud/test/test_cloud_init.py @@ -35,7 +35,7 @@ class TestInit(object): del cloud.supported_drivers['dummy'] def test_get_types(self): - assert cloud.get_types() == ['my_provider'] + assert list(cloud.get_types()) == ['my_provider'] def test_get_provider_conf(self): expected = dummy_config['providers']['my_provider'] diff --git a/teuthology/provision/cloud/test/test_cloud_util.py b/teuthology/provision/cloud/test/test_cloud_util.py index 220833c0e6..8cae3c9dc0 100644 --- a/teuthology/provision/cloud/test/test_cloud_util.py +++ b/teuthology/provision/cloud/test/test_cloud_util.py @@ -18,7 +18,7 @@ from teuthology.provision.cloud import util def test_get_user_ssh_pubkey(path, exists): with patch('os.path.exists') as m_exists: m_exists.return_value = exists - with patch('__builtin__.open', mock_open(), create=True) as m_open: + with patch('teuthology.provision.cloud.util.open', mock_open(), create=True) as m_open: util.get_user_ssh_pubkey(path) if exists: m_open.assert_called_once_with(path, 'rb') diff --git a/teuthology/provision/cloud/util.py b/teuthology/provision/cloud/util.py index 523dfb2eea..b5345cb45b 100644 --- a/teuthology/provision/cloud/util.py +++ b/teuthology/provision/cloud/util.py @@ -57,7 +57,7 @@ def selective_update(a, b, func): continue if isinstance(value, dict): selective_update(a[key], value, func) - if func(value, a[key]): + elif func(value, a[key]): a[key] = value -- 2.39.5