From c5220944d2acdb912c129fc82ac8a83d24e9845d Mon Sep 17 00:00:00 2001
From: Zhidao HONG <z.hong@f5.com>
Date: Thu, 30 Sep 2021 22:17:28 +0800
Subject: Static: variables in the "share" option.

This commit supports variable in the "share" option, the finding path to
file serve is the value from "share". An example:
{
    "share": "/www/data/static$uri"
}
---
 test/test_static_chroot.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'test/test_static_chroot.py')

diff --git a/test/test_static_chroot.py b/test/test_static_chroot.py
index f9bc93a8..aa2952a1 100644
--- a/test/test_static_chroot.py
+++ b/test/test_static_chroot.py
@@ -21,7 +21,7 @@ class TestStaticChroot(TestApplicationProto):
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "routes"}},
-                "routes": [{"action": {"share": temp_dir + "/assets"}}],
+                "routes": [{"action": {"share": temp_dir + "/assets$uri"}}],
             }
         )
 
@@ -31,7 +31,7 @@ class TestStaticChroot(TestApplicationProto):
 
         assert 'success' in self.conf(
             {
-                "share": temp_dir + "/assets",
+                "share": temp_dir + "/assets$uri",
                 "chroot": temp_dir + "/assets/dir",
             },
             'routes/0/action',
@@ -49,7 +49,7 @@ class TestStaticChroot(TestApplicationProto):
 
         assert 'success' in self.conf(
             {
-                "share": temp_dir + "/assets",
+                "share": temp_dir + "/assets$uri",
                 "chroot": temp_dir + "/assets/dir",
             },
             'routes/0/action',
@@ -59,7 +59,8 @@ class TestStaticChroot(TestApplicationProto):
 
     def test_static_chroot_empty(self, temp_dir):
         assert 'success' in self.conf(
-            {"share": temp_dir + "/assets", "chroot": ""}, 'routes/0/action',
+            {"share": temp_dir + "/assets$uri", "chroot": ""},
+            'routes/0/action',
         ), 'configure chroot empty absolute'
 
         assert (
@@ -67,7 +68,7 @@ class TestStaticChroot(TestApplicationProto):
         ), 'chroot empty absolute'
 
         assert 'success' in self.conf(
-            {"share": ".", "chroot": ""}, 'routes/0/action',
+            {"share": ".$uri", "chroot": ""}, 'routes/0/action',
         ), 'configure chroot empty relative'
 
         assert (
@@ -79,19 +80,20 @@ class TestStaticChroot(TestApplicationProto):
             pytest.skip('does\'t work under root')
 
         assert 'success' in self.conf(
-            {"share": temp_dir + "/assets", "chroot": "."}, 'routes/0/action',
+            {"share": temp_dir + "/assets$uri", "chroot": "."},
+            'routes/0/action',
         ), 'configure relative chroot'
 
         assert self.get(url='/dir/file')['status'] == 403, 'relative chroot'
 
         assert 'success' in self.conf(
-            {"share": "."}, 'routes/0/action',
+            {"share": ".$uri"}, 'routes/0/action',
         ), 'configure relative share'
 
         assert self.get(url=self.test_path)['status'] == 200, 'relative share'
 
         assert 'success' in self.conf(
-            {"share": ".", "chroot": "."}, 'routes/0/action',
+            {"share": ".$uri", "chroot": "."}, 'routes/0/action',
         ), 'configure relative'
 
         assert self.get(url=self.test_path)['status'] == 200, 'relative'
-- 
cgit