tests: fix image ID parsing and 9p assertion patterns

test_vdkr_registry.py: Docker's images output changed from separate
REPOSITORY TAG IMAGE_ID columns to combined IMAGE ID DISK_USAGE
columns. The parser grabbed the disk usage (8.45MB) as the image ID.
Handle both old and new formats.

test_container_registry_script.py: The secure registry tests checked
for literal 'virtfs' and 'cashare' strings in vrunner.sh, but the
9p share setup was refactored to use hv_build_9p_opts(). Update
assertions to match the current abstraction.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 25 insertions, 22 deletions

diff --git a/tests/test_container_registry_script.py b/tests/test_container_registry_script.py
index 3089e870..18efb851 100644
--- a/tests/test_container_registry_script.py
+++ b/tests/test_container_registry_script.py
@@ -1497,7 +1497,7 @@ class TestVcontainerSecureRegistry:
             "Should not base64 encode CA cert for kernel cmdline"
 
     def test_vrunner_daemon_sets_9p(self):
-        """Test that daemon mode sets _9p=1 in kernel cmdline."""
+        """Test that daemon mode sets up virtio-9p share and _9p=1."""
         script = Path("/opt/bruce/poky/meta-virtualization/recipes-containers/"
                       "vcontainer/files/vrunner.sh")
         if not script.exists():
@@ -1505,26 +1505,24 @@ class TestVcontainerSecureRegistry:
 
         content = script.read_text()
 
-        # Find the daemon mode block and check for _9p=1
-        # The daemon block should contain both virtfs and _9p=1
+        # Find the daemon mode block and check for 9p setup
         lines = content.split('\n')
         in_daemon_block = False
-        daemon_has_virtfs = False
-        daemon_has_9p = False
+        daemon_has_9p_opts = False
+        daemon_has_9p_flag = False
         for line in lines:
-            if 'DAEMON_MODE" = "start"' in line or "DAEMON_MODE\" = \"start\"" in line:
+            if 'DAEMON_MODE" = "start"' in line or 'DAEMON_MODE = "start"' in line:
                 in_daemon_block = True
             if in_daemon_block:
-                if "virtfs" in line and "DAEMON_SHARE_DIR" in line:
-                    daemon_has_virtfs = True
+                if "hv_build_9p_opts" in line and "DAEMON_SHARE_DIR" in line:
+                    daemon_has_9p_opts = True
                 if "_9p=1" in line:
-                    daemon_has_9p = True
-                # Detect end of the if block (next top-level statement)
-                if line.startswith("fi") and in_daemon_block and daemon_has_virtfs:
+                    daemon_has_9p_flag = True
+                if line.startswith("fi") and in_daemon_block and daemon_has_9p_opts:
                     break
 
-        assert daemon_has_virtfs, "Daemon mode should set up virtio-9p share"
-        assert daemon_has_9p, "Daemon mode should set _9p=1 in kernel cmdline"
+        assert daemon_has_9p_opts, "Daemon mode should set up virtio-9p share via hv_build_9p_opts"
+        assert daemon_has_9p_flag, "Daemon mode should set _9p=1 in kernel cmdline"
 
     def test_vrunner_nondaemon_ca_cert_virtio9p(self):
         """Test that non-daemon mode creates virtio-9p share for CA cert."""
@@ -1536,8 +1534,8 @@ class TestVcontainerSecureRegistry:
         content = script.read_text()
         assert "CA_SHARE_DIR" in content, \
             "Non-daemon mode should create CA_SHARE_DIR for virtio-9p"
-        assert "cashare" in content, \
-            "Should add virtio-9p device for CA cert sharing"
+        assert "hv_build_9p_opts" in content and "CA_SHARE_DIR" in content, \
+            "Should set up virtio-9p device for CA cert sharing via hv_build_9p_opts"
 
     def test_vdkr_init_reads_ca_from_share(self):
         """Test that vdkr-init.sh reads CA cert from /mnt/share/ca.crt."""
diff --git a/tests/test_vdkr_registry.py b/tests/test_vdkr_registry.py
index 72a27169..e429f6ab 100644
--- a/tests/test_vdkr_registry.py
+++ b/tests/test_vdkr_registry.py
@@ -112,15 +112,20 @@ class TestImageCompoundCommands:
             return None, None
 
         # Parse the images output to find alpine
+        # Docker output format varies by version:
+        #   Old: REPOSITORY  TAG  IMAGE ID  CREATED  SIZE
+        #   New: IMAGE  ID  DISK USAGE  CONTENT SIZE  EXTRA
         for line in images_result.stdout.splitlines():
-            if "alpine" in line.lower() and "REPOSITORY" not in line:
-                # Parse: REPOSITORY TAG IMAGE_ID CREATED SIZE
+            if "alpine" in line.lower() and "REPOSITORY" not in line and "IMAGE" not in line:
                 parts = line.split()
-                if len(parts) >= 3:
-                    repo = parts[0]
-                    tag = parts[1]
-                    image_id = parts[2]
-                    return f"{repo}:{tag}", image_id
+                if len(parts) >= 2:
+                    image_ref = parts[0]
+                    image_id = parts[1]
+                    # Old format: repo and tag are separate columns
+                    if ':' not in image_ref and len(parts) >= 3:
+                        image_ref = f"{parts[0]}:{parts[1]}"
+                        image_id = parts[2]
+                    return image_ref, image_id
         return None, None
 
     def test_image_ls(self):