Skip to content

Commit 4da951a

Browse files
committed
Fixed .phpt tests
1 parent adb43fc commit 4da951a

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

agent/native/ext/tests/config_defaults.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ elasticApmAssertSame("getenv('ELASTIC_APM_ENABLED')", getenv('ELASTIC_APM_ENABLE
2525

2626
elasticApmAssertEqual("ini_get('elastic_apm.enabled')", ini_get('elastic_apm.enabled'), false);
2727

28-
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), true);
29-
30-
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), true);
28+
if (($agentEnabledConfigDefaultEnvVar = getenv('ELASTIC_APM_PHP_TESTS_AGENT_ENABLED_CONFIG_DEFAULT')) !== false) {
29+
$agentEnabledConfigDefault = json_decode($agentEnabledConfigDefaultEnvVar);
30+
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), $agentEnabledConfigDefault);
31+
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), $agentEnabledConfigDefault);
32+
}
3133

3234
//////////////////////////////////////////////
3335
/////////////// log_file

agent/native/ext/tests/config_setting_to_invalid_values_using_env_vars.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ require __DIR__ . '/../tests_util/tests_util.php';
1919

2020
elasticApmAssertSame("getenv('ELASTIC_APM_ENABLED')", getenv('ELASTIC_APM_ENABLED'), 'not_valid_boolean_value');
2121

22-
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), true);
23-
24-
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), true);
22+
if (($agentEnabledConfigDefaultEnvVar = getenv('ELASTIC_APM_PHP_TESTS_AGENT_ENABLED_CONFIG_DEFAULT')) !== false) {
23+
$agentEnabledConfigDefault = json_decode($agentEnabledConfigDefaultEnvVar);
24+
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), $agentEnabledConfigDefault);
25+
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), $agentEnabledConfigDefault);
26+
}
2527

2628
//////////////////////////////////////////////
2729
/////////////// assert_level

agent/native/ext/tests/config_setting_to_invalid_values_using_ini.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ require __DIR__ . '/../tests_util/tests_util.php';
1919

2020
elasticApmAssertEqual("ini_get('elastic_apm.enabled')", ini_get('elastic_apm.enabled'), 'not valid boolean value');
2121

22-
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), true);
23-
24-
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), true);
22+
if (($agentEnabledConfigDefaultEnvVar = getenv('ELASTIC_APM_PHP_TESTS_AGENT_ENABLED_CONFIG_DEFAULT')) !== false) {
23+
$agentEnabledConfigDefault = json_decode($agentEnabledConfigDefaultEnvVar);
24+
elasticApmAssertSame("elastic_apm_is_enabled()", elastic_apm_is_enabled(), $agentEnabledConfigDefault);
25+
elasticApmAssertSame("elastic_apm_get_config_option_by_name('enabled')", elastic_apm_get_config_option_by_name('enabled'), $agentEnabledConfigDefault);
26+
}
2527

2628
//////////////////////////////////////////////
2729
/////////////// assert_level

0 commit comments

Comments
 (0)