summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-19 09:29:05 -0500
committerGitHub <noreply@github.com>2022-01-19 09:29:05 -0500
commit8301a7cd828c4576c1e581cb2dd376f42a363a11 (patch)
tree92a32bf4246be2be4cd5325372de7f538c41a27c /test
parentb63e716ffc95f4c4c77a06a9d20085bdcbb67059 (diff)
parent4b384e08a9680d480976ab575ecf54acdb4d1922 (diff)
downloadpodman-8301a7cd828c4576c1e581cb2dd376f42a363a11.tar.gz
podman-8301a7cd828c4576c1e581cb2dd376f42a363a11.tar.bz2
podman-8301a7cd828c4576c1e581cb2dd376f42a363a11.zip
Merge pull request #12862 from matejvasek/fix-info-ep
Add IndexConfigs info to compat /info endpoint
Diffstat (limited to 'test')
-rw-r--r--test/python/docker/__init__.py21
-rw-r--r--test/python/docker/compat/test_system.py5
2 files changed, 16 insertions, 10 deletions
diff --git a/test/python/docker/__init__.py b/test/python/docker/__init__.py
index 80fc2a133..816667b82 100644
--- a/test/python/docker/__init__.py
+++ b/test/python/docker/__init__.py
@@ -42,16 +42,19 @@ class Podman(object):
os.environ["CONTAINERS_REGISTRIES_CONF"] = os.path.join(
self.anchor_directory, "registry.conf"
)
- p = configparser.ConfigParser()
- p.read_dict(
- {
- "registries.search": {"registries": "['quay.io', 'docker.io']"},
- "registries.insecure": {"registries": "[]"},
- "registries.block": {"registries": "[]"},
- }
- )
+ conf = """unqualified-search-registries = ["docker.io", "quay.io"]
+
+[[registry]]
+location="localhost:5000"
+insecure=true
+
+[[registry.mirror]]
+location = "mirror.localhost:5000"
+
+"""
+
with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w:
- p.write(w)
+ w.write(conf)
os.environ["CNI_CONFIG_PATH"] = os.path.join(
self.anchor_directory, "cni", "net.d"
diff --git a/test/python/docker/compat/test_system.py b/test/python/docker/compat/test_system.py
index 131b18991..a928de0ee 100644
--- a/test/python/docker/compat/test_system.py
+++ b/test/python/docker/compat/test_system.py
@@ -54,7 +54,10 @@ class TestSystem(unittest.TestCase):
return super().tearDownClass()
def test_Info(self):
- self.assertIsNotNone(self.client.info())
+ info = self.client.info()
+ self.assertIsNotNone(info)
+ self.assertEqual(info["RegistryConfig"]["IndexConfigs"]["localhost:5000"]["Secure"], False)
+ self.assertEqual(info["RegistryConfig"]["IndexConfigs"]["localhost:5000"]["Mirrors"], ["mirror.localhost:5000"])
def test_info_container_details(self):
info = self.client.info()