From 1cb8093eb55e964c6dd0a11454eef02d65e72a2b Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Wed, 3 Jan 2024 19:12:56 -0800
Subject: [PATCH] chore(ci) fix Large CI unit tests in HUP mode

---
 .github/workflows/ci-large.yml                         | 4 ++--
 t/03-proxy_wasm/007-on_http_instance_isolation.t       | 7 +++++--
 t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t | 4 ++--
 t/03-proxy_wasm/hfuncs/123-proxy_properties_set_host.t | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml
index 7a85d52f0..acde119b5 100644
--- a/.github/workflows/ci-large.yml
+++ b/.github/workflows/ci-large.yml
@@ -1,8 +1,8 @@
 name: Large CI
 
 on:
-  #pull_request:
-  #  branches: '**'
+  pull_request:
+    branches: '**'
   schedule:
     - cron: '0 9 * * *' # 9am UTC, 2am PST
   workflow_dispatch:
diff --git a/t/03-proxy_wasm/007-on_http_instance_isolation.t b/t/03-proxy_wasm/007-on_http_instance_isolation.t
index 7d6e4b4e1..05a75fa41 100644
--- a/t/03-proxy_wasm/007-on_http_instance_isolation.t
+++ b/t/03-proxy_wasm/007-on_http_instance_isolation.t
@@ -7,6 +7,7 @@ use t::TestWasm;
 skip_no_debug();
 
 plan_tests(8);
+no_shuffle();
 run_tests();
 
 __DATA__
@@ -118,7 +119,9 @@ qr/\A\*\d+ .*? filter new instance[^#*]*
 
 === TEST 3: proxy_wasm - stream isolation mode
 should use an instance per stream
+req0 might free an instance from the previous test in HUP mode.
 --- valgrind
+--- load_nginx_modules: ngx_http_echo_module
 --- wasm_modules: hostcalls
 --- config
     proxy_wasm_isolation stream;
@@ -133,10 +136,10 @@ should use an instance per stream
 --- ignore_response_body
 --- grep_error_log eval: qr/(\*\d+.*?(resuming|new instance|reusing|finalizing|freeing|trap in)|#\d+ on_(configure|vm_start)).*/
 --- grep_error_log_out eval
-[qr/#0 on_vm_start[^#*]*
+[qr/(\*\d+ .*? freeing "hostcalls" instance in "main" vm \(.*?\)[^#*]*)?#0 on_vm_start[^#*]*
 #0 on_configure[^#*]*
 #0 on_vm_start[^#*]*
-#0 on_configure[^#*]*
+#0 on_configure[^#*]*(\*\d+ .*? freeing "hostcalls" instance in "main" vm \(.*?\)[^#*]*)?
 \*\d+ .*? filter new instance[^#*]*
 #0 on_configure[^#*]*
 \*\d+ .*? filter reusing instance[^#*]*
diff --git a/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t b/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t
index 15887b50e..d80d4ebe7 100644
--- a/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t
+++ b/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t
@@ -132,7 +132,7 @@ qr/\[info\] .*? property not found: was,/
 --- load_nginx_modules: ngx_http_echo_module
 --- config
     location /t {
-        proxy_wasm hostcalls 'tick_period=100 \
+        proxy_wasm hostcalls 'tick_period=500 \
                               on_tick=log_property \
                               name=wasmx.my_var';
         echo_sleep 0.150;
@@ -156,7 +156,7 @@ qr/\[info\] .*? property not found: was,/
     location /t {
         proxy_wasm_isolation stream;
 
-        proxy_wasm hostcalls 'tick_period=100 \
+        proxy_wasm hostcalls 'tick_period=500 \
                               on_tick=log_property \
                               name=wasmx.my_var';
         echo_sleep 0.150;
diff --git a/t/03-proxy_wasm/hfuncs/123-proxy_properties_set_host.t b/t/03-proxy_wasm/hfuncs/123-proxy_properties_set_host.t
index 584cdabae..285060dd6 100644
--- a/t/03-proxy_wasm/hfuncs/123-proxy_properties_set_host.t
+++ b/t/03-proxy_wasm/hfuncs/123-proxy_properties_set_host.t
@@ -147,7 +147,7 @@ ngx_http_* calls.
     set $my_var 123;
 
     location /t {
-        proxy_wasm hostcalls 'tick_period=100 \
+        proxy_wasm hostcalls 'tick_period=500 \
                               on_tick=set_property \
                               name=wasmx.my_var \
                               show_old=false \
@@ -179,7 +179,7 @@ ngx_http_* calls.
     location /t {
         proxy_wasm_isolation stream;
 
-        proxy_wasm hostcalls 'tick_period=100 \
+        proxy_wasm hostcalls 'tick_period=500 \
                               on_tick=set_property \
                               name=wasmx.my_var \
                               show_old=false \