From d5c1d1405c27637e87ad0e33912c7878c31dbef0 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 6 Feb 2014 08:34:15 -0700
Subject: [PATCH] client.ping() requests now set the proper requestTimeout
 default

---
 scripts/generate/js_api.js |  1 +
 src/lib/apis/0_90.js       |  1 +
 src/lib/apis/1_0.js        |  1 +
 src/lib/apis/1_x.js        |  1 +
 src/lib/apis/master.js     |  1 +
 test/unit/specs/client.js  | 10 ++++++++++
 6 files changed, 15 insertions(+)

diff --git a/scripts/generate/js_api.js b/scripts/generate/js_api.js
index 72b7b1826..5be8719b3 100644
--- a/scripts/generate/js_api.js
+++ b/scripts/generate/js_api.js
@@ -261,6 +261,7 @@ module.exports = function (branch, done) {
           'url',
           'urls',
           'needBody',
+          'requestTimeout',
           'bulkBody'
         ]),
         location: location,
diff --git a/src/lib/apis/0_90.js b/src/lib/apis/0_90.js
index c8c66914f..a52ec4298 100644
--- a/src/lib/apis/0_90.js
+++ b/src/lib/apis/0_90.js
@@ -2846,6 +2846,7 @@ api.ping = ca({
   url: {
     fmt: '/'
   },
+  requestTimeout: 100,
   method: 'HEAD'
 });
 
diff --git a/src/lib/apis/1_0.js b/src/lib/apis/1_0.js
index 0f15861fa..47e63256d 100644
--- a/src/lib/apis/1_0.js
+++ b/src/lib/apis/1_0.js
@@ -4392,6 +4392,7 @@ api.ping = ca({
   url: {
     fmt: '/'
   },
+  requestTimeout: 100,
   method: 'HEAD'
 });
 
diff --git a/src/lib/apis/1_x.js b/src/lib/apis/1_x.js
index 0f15861fa..47e63256d 100644
--- a/src/lib/apis/1_x.js
+++ b/src/lib/apis/1_x.js
@@ -4392,6 +4392,7 @@ api.ping = ca({
   url: {
     fmt: '/'
   },
+  requestTimeout: 100,
   method: 'HEAD'
 });
 
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index 899b5675f..277a11c03 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -4392,6 +4392,7 @@ api.ping = ca({
   url: {
     fmt: '/'
   },
+  requestTimeout: 100,
   method: 'HEAD'
 });
 
diff --git a/test/unit/specs/client.js b/test/unit/specs/client.js
index a3b2500bc..d8a1a57f9 100644
--- a/test/unit/specs/client.js
+++ b/test/unit/specs/client.js
@@ -3,6 +3,7 @@ describe('Client instances creation', function () {
   var es = require('../../../src/elasticsearch');
   var apis = require('../../../src/lib/apis');
   var expect = require('expect.js');
+  var stub = require('../../utils/auto_release_stub').make();
   var client;
 
   beforeEach(function () {
@@ -50,4 +51,13 @@ describe('Client instances creation', function () {
     expect(client.transport.log.listenerCount('debug')).to.eql(0);
     expect(client.transport.log.listenerCount('trace')).to.eql(0);
   });
+
+  describe('#ping', function () {
+    it('sets the default requestTimeout to 100', function () {
+      stub(client.transport, 'request');
+      client.ping();
+      expect(client.transport.request.callCount).to.be(1);
+      expect(client.transport.request.lastCall.args[0].requestTimeout).to.be(100);
+    });
+  });
 });