robotest own container

Author: marcwimmer

wodoo/lib_composer.py

@@ -45,6 +45,7 @@
 from .tools import update_docker_service
 from .tools import autocleanpaper
 from .tools import sync_folder
+from .tools import _yamldump
 
 import inspect
 import os
@@ -852,19 +853,6 @@ def post_process_complete_yaml_config(config, yml):
     return yml
 
 
-def _yamldump(content):
-    import yaml
-
-    class NoAliasDumper(yaml.SafeDumper):
-        def ignore_aliases(self, data):
-            return True
-
-    file_content = yaml.dump(
-        content, default_flow_style=False, sort_keys=False
-    )  # , Dumper=NoAliasDumper)
-    return file_content
-
-
 def __run_docker_compose_config(config, contents, env):
     import yaml
 
@@ -1287,7 +1275,6 @@ def _merge_odoo_dockerfile(config):
         if not dockerfile:
             continue
         if "odoo/images/odoo" in dockerfile:
-            Path(config.files["odoo_docker_file"]).parent.mkdir(exist_ok=True, parents=True)
             shutil.copy(dockerfile, config.files["odoo_docker_file"])
             dockerfile1 = dockerfile
             service["build"]["dockerfile"] = str(
@@ -1302,7 +1289,6 @@ def _merge_odoo_dockerfile(config):
         click.secho(
             f"Copying {dockerfile1} to {config.files['odoo_docker_file']}"
         )
-        config.files["odoo_docker_file"].parent.mkdir(exist_ok=True, parents=True)
         config.files["odoo_docker_file"].write_text(
             Path(dockerfile1).read_text()
         )

wodoo/lib_robot.py

@@ -1,4 +1,5 @@
 import subprocess
+from copy import deepcopy
 import random
 import time
 import sys
@@ -18,6 +19,7 @@
 from .tools import abort
 from .tools import __assure_gitignore
 from .tools import _get_available_robottests
+from .tools import _yamldump
 from pathlib import Path
 
 ROBOT_UTILS_GIT = "marcwimmer/odoo-robot_utils"
@@ -428,6 +430,10 @@ def params():
 
         return params
 
+    unique_robotname = f"robot_{uuid.uuid4()}"
+    # copy robot and seleniumdriver template to have an instance
+    selenium_service_name = _clone_seleniumdriver_template(ctx, config, unique_robotname)
+
     token = arrow.get().strftime("%Y-%m-%d_%H%M%S_") + str(uuid.uuid4())
     data = json.dumps(
         {
@@ -436,6 +442,7 @@ def params():
             "results_file": results_file or "",
             "debug": debug,
             "params": params(),
+            "SELENIUM_SERVICE_NAME": selenium_service_name,
         }
     )
     data = base64.b64encode(data.encode("utf-8")).decode("utf8")
@@ -458,14 +465,22 @@ def params():
             env=os.environ,
         )
     else:
-        __dcrun(config, params, pass_stdin=data, interactive=True)
+        try:
+            Commands.invoke(ctx, "up", daemon=True, machines=[selenium_service_name])
+            __dcrun(config, params, pass_stdin=data, interactive=True)
+        finally:
+            # ensure that the seleniumdriver is stopped
+            Commands.invoke(ctx, "kill", machines=[selenium_service_name])
+            Commands.invoke(ctx, "remove", machines=[selenium_service_name])
+            click.secho(
+                f"Stopped seleniumdriver {selenium_service_name} container",
+                fg="yellow",
+            )
     del data
 
     output_path = config.HOST_RUN_DIR / "odoo_outdir" / "robot_output"
     from .robo_helpers import _eval_robot_output
 
-    Commands.invoke(ctx, "restart", machines=["seleniumdriver"])
-
     res = _eval_robot_output(
         config,
         output_path,
@@ -477,6 +492,16 @@ def params():
     )
     return res
 
+def _clone_seleniumdriver_template(ctx, config, appendix):
+    import yaml
+    yml = yaml.safe_load(open(config.files['docker_compose'], "r"))
+    
+    service_name = f"seleniumdriver_{appendix}"
+    yml['services'][service_name] = deepcopy(yml['services']['seleniumdriver_template'])
+    yml['services'][service_name]['container_name'] = service_name
+    config.files['docker_compose'].write_text(_yamldump(yml))
+    return service_name
+
 
 def _prepare_fresh_robotest(ctx):
     click.secho("Preparing fresh robo test.", fg="yellow")

wodoo/tools.py

@@ -2057,3 +2057,16 @@ def choose_ip(ips):
 
 def get_arch():
     return platform.uname().machine  # aarch64
+
+def _yamldump(content):
+    import yaml
+
+    class NoAliasDumper(yaml.SafeDumper):
+        def ignore_aliases(self, data):
+            return True
+
+    file_content = yaml.dump(
+        content, default_flow_style=False, sort_keys=False
+    )  # , Dumper=NoAliasDumper)
+    return file_content
+