From 6c14d5d7b1921bd78f2d1b7458eae7d97eee0fcd Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Fri, 2 Jul 2021 13:00:04 +0000
Subject: Tests: run Ruby applications inside temporary directory.

---
 test/unit/applications/lang/ruby.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'test/unit/applications/lang/ruby.py')

diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py
index 02644584..d95d62b4 100644
--- a/test/unit/applications/lang/ruby.py
+++ b/test/unit/applications/lang/ruby.py
@@ -1,12 +1,26 @@
+import os
+import shutil
+
 from unit.applications.proto import TestApplicationProto
 from unit.option import option
+from unit.utils import public_dir
 
 
 class TestApplicationRuby(TestApplicationProto):
     application_type = "ruby"
 
+    def prepare_env(self, script):
+        shutil.copytree(
+            option.test_dir + '/ruby/' + script,
+            option.temp_dir + '/ruby/' + script
+        )
+
+        public_dir(option.temp_dir + '/ruby/' + script)
+
     def load(self, script, name='config.ru', **kwargs):
-        script_path = option.test_dir + '/ruby/' + script
+        self.prepare_env(script)
+
+        script_path = option.temp_dir + '/ruby/' + script
 
         self._load_conf(
             {
-- 
cgit 


From 8c83652c2a0ad7386e27a9ea595c996d3dce018c Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Fri, 2 Jul 2021 13:00:57 +0000
Subject: Tests: Ruby hooks.

---
 test/unit/applications/lang/ruby.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'test/unit/applications/lang/ruby.py')

diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py
index d95d62b4..61d50558 100644
--- a/test/unit/applications/lang/ruby.py
+++ b/test/unit/applications/lang/ruby.py
@@ -12,7 +12,7 @@ class TestApplicationRuby(TestApplicationProto):
     def prepare_env(self, script):
         shutil.copytree(
             option.test_dir + '/ruby/' + script,
-            option.temp_dir + '/ruby/' + script
+            option.temp_dir + '/ruby/' + script,
         )
 
         public_dir(option.temp_dir + '/ruby/' + script)
@@ -22,17 +22,23 @@ class TestApplicationRuby(TestApplicationProto):
 
         script_path = option.temp_dir + '/ruby/' + script
 
+        app = {
+            "type": self.get_application_type(),
+            "processes": {"spare": 0},
+            "working_directory": script_path,
+            "script": script_path + '/' + name,
+        }
+
+        for key in [
+            'hooks',
+        ]:
+            if key in kwargs:
+                app[key] = kwargs[key]
+
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "applications/" + script}},
-                "applications": {
-                    script: {
-                        "type": self.get_application_type(),
-                        "processes": {"spare": 0},
-                        "working_directory": script_path,
-                        "script": script_path + '/' + name,
-                    }
-                },
+                "applications": {script: app},
             },
             **kwargs
         )
-- 
cgit