Adjustments after merge master

SUSE-Enceladus · Apr 17, 2024 · 6c0eaf0 · 6c0eaf0
1 parent 9d041bb
commit 6c0eaf0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.virtualenv.requirements.txt b/.virtualenv.requirements.txt
@@ -2,3 +2,4 @@ lxml
 requests
 dnspython
 M2Crypto
+toml
diff --git a/lib/cloudregister/registerutils.py b/lib/cloudregister/registerutils.py
@@ -50,6 +50,7 @@
 DOCKER_CONFIG_PATH = '/etc/docker/daemon.json'
 REGISTRIES_CONF_PATH = '/etc/containers/registries.conf'
 
+
 # ----------------------------------------------------------------------------
 def add_hosts_entry(smt_server):
     """Add an entry to the /etc/hosts file for the given SMT server"""
@@ -1726,7 +1727,9 @@ def _set_registry_order_search_podman(registry_fqdn):
         with open(REGISTRIES_CONF_PATH, 'r') as registries_conf_file:
             registries_conf = toml.load(registries_conf_file)
 
-        if registry_fqdn not in registries_conf['unqualified-search-registries']:  # no-qa
+        missing_registry_fqdn = registry_fqdn not in \
+            registries_conf['unqualified-search-registries']
+        if missing_registry_fqdn:
             registries_conf['unqualified-search-registries'] = \
                 ["{}".format(registry_fqdn), 'registry.suse.com'] + \
                 registries_conf['unqualified-search-registries']

diff --git a/tests/test_registerutils.py b/tests/test_registerutils.py
@@ -533,12 +533,14 @@ def test_add_hosts_entry(mock_has_ipv6_access):
             '\n# Added by SMT registration do not remove, '
             'retain comment as well\n'
         )
-        file_content_entry = '{ip}\t{fqdn}\t{name}\n{ip_reg}\t{reg_name}\n'.format(
-            ip=smt_server.get_ipv6(),
-            fqdn=smt_server.get_FQDN(),
-            name=smt_server.get_name(),
-            ip_reg=smt_server.get_ipv6(),
-            reg_name=smt_server.get_registry_FQDN()
+        file_content_entry = (
+            '{ip}\t{fqdn}\t{name}\n{ip_reg}\t{reg_name}\n'.format(
+                ip=smt_server.get_ipv6(),
+                fqdn=smt_server.get_FQDN(),
+                name=smt_server.get_name(),
+                ip_reg=smt_server.get_ipv6(),
+                reg_name=smt_server.get_registry_FQDN()
+            )
         )
         assert file_handle.write.mock_calls == [
              call(file_content_comment),
@@ -3055,6 +3057,7 @@ def test_set_registry_credentials_config_does_not_exist(
 
     with patch('builtins.open', create=True) as mock_open:
         mock_open_docker_config = MagicMock(spec=io.IOBase)
+
         def open_file(filename, mode):
             if mode == 'w':
                 return mock_open_docker_config.return_value
@@ -3103,14 +3106,15 @@ def test_set_registry_credentials_config_does_exist(
 
     with patch('builtins.open', create=True) as mock_open:
         mock_open_docker_config = MagicMock(spec=io.IOBase)
+
         def open_file(filename, mode):
             return mock_open_docker_config.return_value
 
         mock_open.side_effect = open_file
         file_handle = \
             mock_open_docker_config.return_value.__enter__.return_value
         file_handle.read.return_value = ''
-        mock_json_load.return_value = {"auths":{"127.0.0.1": {"auth": 'foo'}}}
+        mock_json_load.return_value = {"auths": {"127.0.0.1": {"auth": 'foo'}}}
 
         utils.set_registry_credentials('127.0.0.1', username, password, '')