From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 12 Jan 2018 20:13:28 +0000 (+0000)
Subject: Merge "config: Increase coverage of EtcdConfig::parseDirectory()"
X-Git-Tag: 1.31.0-rc.0~921
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=de88ec881861b6ed5dd6c0e1e69a567a2cf7ba82;hp=bee9f4db96b4aec51feeddb8ccdca353c034f12f;p=lhc%2Fweb%2Fwiklou.git

Merge "config: Increase coverage of EtcdConfig::parseDirectory()"
---

diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php b/tests/phpunit/includes/config/EtcdConfigTest.php
index 7a4d9d9f6f..379eebd8a4 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -461,6 +461,26 @@ class EtcdConfigTest extends PHPUnit_Framework_TestCase {
 					false // retry
 				],
 			],
+			'200 OK - Directory with non-array "nodes" key' => [
+				'http' => [
+					'code' => 200,
+					'reason' => 'OK',
+					'headers' => [],
+					'body' => json_encode( [ 'node' => [ 'nodes' => [
+						[
+							'key' => '/example/a',
+							'dir' => true,
+							'nodes' => 'not an array'
+						],
+					] ] ] ),
+					'error' => '',
+				],
+				'expect' => [
+					null,
+					"Unexpected JSON response in dir 'a'; 'nodes' is not an array.",
+					false // retry
+				],
+			],
 			'200 OK - Correctly encoded garbage response' => [
 				'http' => [
 					'code' => 200,