WIP

Author: slonopotamus

src/ue4docker/test.py

@@ -2,6 +2,8 @@
 import os
 import sys
 
+from docker.errors import ImageNotFound
+
 from .infrastructure import (
     ContainerUtils,
     DockerUtils,
@@ -22,26 +24,28 @@ def test():
     if len(sys.argv) > 1 and sys.argv[1].strip("-") not in ["h", "help"]:
         # Verify that the specified container image exists
         tag = sys.argv[1]
-        image = GlobalConfiguration.resolveTag(
+        image_name = GlobalConfiguration.resolveTag(
             "ue4-full:{}".format(tag) if ":" not in tag else tag
         )
-        if not DockerUtils.exists(image):
+        try:
+            image = client.images.get(image_name)
+        except ImageNotFound:
             logger.error(
                 'Error: the specified container image "{}" does not exist.'.format(
-                    image
+                    image_name
                 )
             )
             sys.exit(1)
 
         # Use process isolation mode when testing Windows containers, since running Hyper-V containers don't currently support manipulating the filesystem
-        platform = ImageUtils.image_platform(client, image)
+        platform = image.attrs["Os"]
         isolation = "process" if platform == "windows" else None
 
         # Start a container to run our tests in, automatically stopping and removing the container when we finish
         logger.action(
-            'Starting a container using the "{}" image...'.format(image), False
+            'Starting a container using the "{}" image...'.format(image_name), False
         )
-        container = ContainerUtils.start_for_exec(client, image, isolation=isolation)
+        container = ContainerUtils.start_for_exec(client, image_name, isolation=isolation)
         with ContainerUtils.automatically_stop(container):
             # Create the workspace directory in the container
             workspaceDir = ContainerUtils.workspace_dir(container)