fix(tests): Removes #skipif

These tests are not actually for PHP 5 only but are simply run with CLM disabled so a #skipif is not required.
newrelic · Sep 21, 2023 · dfebf27 · dfebf27
1 parent 2b331ac
commit dfebf27
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 120 deletions.
diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php
@@ -19,13 +19,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/...gration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php b/...gration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php
@@ -20,13 +20,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php
@@ -19,13 +19,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute not added
 ok - int attribute not added

diff --git a/...ation/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php b/...ation/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php
@@ -22,13 +22,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute not added
 ok - int attribute not added
@@ -103,7 +96,9 @@
     [{"name":"Supportability/api/add_custom_tracer"},               [1, 0, 0, 0, 0, 0]],
     [{"name":"Supportability/api/add_custom_span_parameter"},       [4, 0, 0, 0, 0, 0]],
     [{"name":"Supportability/Logging/Forwarding/PHP/disabled"},      [1, "??", "??", "??", "??", "??"]],
-    [{"name":"Supportability/Logging/Metrics/PHP/disabled"},         [1, "??", "??", "??", "??", "??"]]  ]
+    [{"name":"Supportability/Logging/Metrics/PHP/disabled"},         [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},  [1, "??", "??", "??", "??", "??"]]
+  ]
 ]
 */
 

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php
@@ -17,13 +17,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute not added
 ok - int attribute added

diff --git a/...tegration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php b/...tegration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php
@@ -18,13 +18,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute not added
 ok - int attribute added

diff --git a/...tegration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php b/...tegration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php
@@ -18,13 +18,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php
@@ -16,13 +16,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - int attribute added

diff --git a/...gration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php b/...gration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php
@@ -22,13 +22,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - int attribute added

diff --git a/...ation/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php b/...ation/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php
@@ -17,13 +17,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/...pi/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php b/...pi/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php
@@ -19,13 +19,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/...m_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php b/...m_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php
@@ -22,13 +22,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/...tion/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php b/...tion/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php
@@ -18,13 +18,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/...i/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php b/...i/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php
@@ -19,13 +19,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - string attribute added

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php
@@ -16,12 +16,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
 /*EXPECT
 ok - transaction event attribute added
 ok - span event attribute added
@@ -71,7 +65,7 @@
         "parentId": "??"
       },
       {
-        "int": 102,
+        "int": 100,
         "string": "from span event",
         "bool": false
       },

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php
@@ -18,13 +18,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - int attribute added

diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php
@@ -17,13 +17,6 @@
 newrelic.code_level_metrics.enabled=false
 */
 
-/*SKIPIF
-<?php
-if (version_compare(PHP_VERSION, "7.0", ">=")) {
-  die("skip: PHP 7+ not supported\n");
-}
-*/
-
 /*EXPECT
 ok - string attribute added
 ok - int attribute added