cloud/util: make syntax py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/provision/cloud/test/test_cloud_init.py b/teuthology/provision/cloud/test/test_cloud_init.py
index 59fe6c55563e89011299b9c3201f633d38336f7b..fdee723e6c9011449ebadf9cf068174ed0af8c84 100644 (file)
--- 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 220833c0e630d28d622977c23228165351a29f08..8cae3c9dc06cf9a9ba128c4faf3e9438152e5281 100644 (file)
--- 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 523dfb2eea810d72b1cb291df7a1be8e8bb46204..b5345cb45b3505e410a7a57579c11d8019073e66 100644 (file)
--- 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