split tests

Author: ZNeumann

tests/integration/memcached/test_add_servers.php

@@ -6,7 +6,7 @@
 
 /*DESCRIPTION
 The agent should report instance metrics when multiple servers are
-added at once
+added at once via Memcached::addServers()
 */
 
 /*SKIPIF
@@ -17,12 +17,14 @@
 */
 
 /*EXPECT_METRICS_EXIST
-Datastore/instance/Memcached/host1/1
-Datastore/instance/Memcached/host2/2
-Datastore/instance/Memcached/host3/11211
-Datastore/instance/Memcached/host4/1
+Datastore/instance/Memcached/host1/1, 1
+Datastore/instance/Memcached/host2/2, 1
+Datastore/instance/Memcached/host3/11211, 1
+Datastore/instance/Memcached/host4/1, 1
 */
 
+/*EXPECT_ERROR_EVENTS null */
+
 require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php');
 require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php');
 require_once(realpath (dirname ( __FILE__ )) . '/memcache.inc');
@@ -34,8 +36,4 @@
                        array("host3", 11211)));
 $memcached->addServers(array());
 $memcached->addServers(array(array("host4", 1, "test field")));
-$memcached->addServers(array(array(1)));
-$memcached->addServers(array(array("host1")));
-$memcached->addServers(array(array(1, "host1")));
-//$memcahed->addServers("string"); crashes PHP
 $memcached->quit();

tests/integration/memcached/test_add_servers_bad.php

@@ -0,0 +1,63 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+The agent should gracefully handle when malformed server entries
+are added via Memcached::addServers()
+*/
+
+/*SKIPIF
+<?php require('skipif.inc'); ?>
+*/
+
+/*INI
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Warning:\s*could not add entry\s*$
+^\s*(PHP )?Warning:\s*could not add entry\s*$
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "E_WARNING",
+        "error.message": "Memcached::addServers(): could not add entry #2 to the server list",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php');
+require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php');
+require_once(realpath (dirname ( __FILE__ )) . '/memcache.inc');
+
+$memcached = new Memcached();
+$memcached->addServers(array(array(1)));
+$memcached->addServers(array(array("host1")));
+$memcached->addServers(array(array(1, "host1")));
+//$memcahed->addServers("string"); crashes PHP
+$memcached->quit();