Skip to content

Commit

Permalink
Pass RT_TEST_DISABLE_CONFIG_CACHE to fcigd/mod_perl configs
Browse files Browse the repository at this point in the history
Without it, t/web/priority.t would fail. Unlike others, proxy_fcgi does
not clean up current env, so it's not affected.
  • Loading branch information
sunnavy committed Jan 3, 2024
1 parent 8d598c5 commit 58eb260
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/RT/Test/Apache.pm
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ sub start_server {
rt_sbin_path => $RT::SbinPath,
rt_site_config => $ENV{'RT_SITE_CONFIG'},
load_modules => $info{load_modules},
rt_test_disable_config_cache => $ENV{RT_TEST_DISABLE_CONFIG_CACHE} ? 1 : 0,
);
if (not $config{basic_auth}) {
$opt{basic_auth} = "";
Expand Down
1 change: 1 addition & 0 deletions t/data/configs/apache2.4+fcgid.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ FcgidConnectTimeout 20
FcgidProcessTableFile %%tmp_dir%%/shm
FcgidIPCDir %%tmp_dir%%
FcgidInitialEnv RT_TESTING 1
FcgidInitialEnv RT_TEST_DISABLE_CONFIG_CACHE %%RT_TEST_DISABLE_CONFIG_CACHE%%
FcgidInitialEnv RT_SITE_CONFIG %%RT_SITE_CONFIG%%

ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/
Expand Down
1 change: 1 addition & 0 deletions t/data/configs/apache2.4+mod_perl.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ DocumentRoot "%%DOCUMENT_ROOT%%"

<Perl>
$ENV{RT_TESTING}=1;
$ENV{RT_TEST_DISABLE_CONFIG_CACHE}=%%RT_TEST_DISABLE_CONFIG_CACHE%%;
use Plack::Handler::Apache2;
Plack::Handler::Apache2->preload("%%RT_SBIN_PATH%%/rt-server");
</Perl>
Expand Down

0 comments on commit 58eb260

Please sign in to comment.