Add env node in task config.

OpenSIPS · Aug 29, 2024 · 555bd92 · 555bd92
1 parent 1e28499
commit 555bd92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/sipssert/task.py b/sipssert/task.py
@@ -234,7 +234,8 @@ def get_args(self):
         return self.get_task_args() + self.get_config_args()
 
     def get_task_env(self):
-        return {}
+        env = self.config.get("env", {})
+        return env
 
     def run(self):
         self.container.start()

diff --git a/sipssert/tasks/mysql-client.py b/sipssert/tasks/mysql-client.py
@@ -33,8 +33,7 @@ def __init__(self, test_dir, config):
             self.script = os.path.join(self.mount_point, self.script)
 
     def get_task_env(self):
-
-        env_dict = {}
+        env_dict = self.config.get("env", {})
 
         if "user" in self.config:
             self.user = self.config["user"]

diff --git a/sipssert/tasks/mysql.py b/sipssert/tasks/mysql.py
@@ -28,15 +28,15 @@ class MysqlTask(Task):
 
     def get_task_env(self):
 
-        env_dict = {}
+        env_dict = self.config.get("env", {})
 
         if "root_password" in self.config:
             self.root_password = self.config["root_password"]
 
         if self.root_password:
             env_dict["MYSQL_ROOT_PASSWORD"] = self.root_password
         else:
-            env_dict = self.mysql_default_env
+            env_dict.update(self.mysql_default_env)
 
         return env_dict
 

diff --git a/sipssert/tasks/postgresql.py b/sipssert/tasks/postgresql.py
@@ -28,15 +28,15 @@ class PostgresqlTask(Task):
 
     def get_task_env(self):
 
-        env_dict = {}
+        env_dict = self.config.get("env", {})
 
         if "postgres_password" in self.config:
             self.root_password = self.config["postgres_password"]
 
         if self.root_password:
             env_dict["POSTGRES_PASSWORD"] = self.root_password
         else:
-            env_dict = self.postgresql_default_env
+            env_dict.update(self.postgresql_default_env)
 
         return env_dict