habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
delvedor
2020-04-14 14:50:16 +02:00
parent 521e2e55ea
commit 37042aea33
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/behavior/sniff.test.js
View File

@ -135,12 +135,7 @@ test('Sniff interval', t => {
t.strictEqual(reason, Transport.sniffReasons.SNIFF_INTERVAL) t.strictEqual(reason, Transport.sniffReasons.SNIFF_INTERVAL)
}) })
<<<<<<< HEAD
t.strictEqual(client.connectionPool.connections.size, 1)
setTimeout(() => client.info(t.error), 60)
=======
t.strictEqual(client.connectionPool.size, 1) t.strictEqual(client.connectionPool.size, 1)
>>>>>>> fd8f02b9... Fix flaky test (#1158)
q.add((q, done) => { q.add((q, done) => {
clock.tick(51) clock.tick(51)
@ -157,11 +152,6 @@ test('Sniff interval', t => {
kill('node1', done) kill('node1', done)
}) })
<<<<<<< HEAD
setTimeout(() => {
t.strictEqual(client.connectionPool.connections.size, 3)
}, 200)
=======
q.add((q, done) => { q.add((q, done) => {
clock.tick(51) clock.tick(51)
client.info(err => { client.info(err => {
@ -172,7 +162,6 @@ test('Sniff interval', t => {
}) })
}) })
}) })
>>>>>>> fd8f02b9... Fix flaky test (#1158)
t.teardown(shutdown) t.teardown(shutdown)