config: Fix invalid EtcdConfig return value after JSON parse error

Follows-up 1f2daa9, 9b459d2, 110a21e. Bug: T156924 Change-Id: I79b7e11b32e5be46c8ebdfb5c937e38e46301c0e

Author: Krinkle

includes/config/EtcdConfig.php

@@ -243,7 +243,7 @@ protected function fetchAllFromEtcdServer( $address ) {
 
 $info = json_decode( $rbody, true );
 if ( $info === null || !isset( $info['node']['nodes'] ) ) {
-return [ null, $rcode, "Unexpected JSON response; missing 'nodes' list.", false ];
+return [ null, "Unexpected JSON response; missing 'nodes' list.", false ];
 }
 
 $config = [];

tests/phpunit/includes/config/EtcdConfigTest.php

@@ -364,22 +364,18 @@ public function testLoadCacheExpiredNoLock() {
 
 public static function provideFetchFromServer() {
 return [
-[
+'200 OK - Empty' => [
 'http' => [
 'code' => 200,
 'reason' => 'OK',
-'headers' => [
-'content-length' => 0,
-],
+'headers' => [ 'content-length' => 0 ],
 'body' => '',
 'error' => '(curl error: no status set)',
 ],
 'expect' => [
-// FIXME: Returning 4 values instead of 3
-null,
-200,
+null, // data
 "Unexpected JSON response; missing 'nodes' list.",
-false
+false // retry
 ],
 ],
 ];