GaoreGo/goes
7
0
Fork 0
Code Pull Requests Releases 2 Activity

Merge pull request #26 from pib/test_index_status_refresh

Browse Source 
Call _refresh to ensure index is refreshed before getting the status
This commit is contained in:
Jérôme Renard 2015-07-04 15:41:41 +02:00
commit 5edfd2e653
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -4,18 +4,25 @@ go:
- 1.1 - 1.1
- 1.2 - 1.2
- 1.3 - 1.3
- 1.4.2
- tip - tip
env: env:
matrix: matrix:
- ES_VERSION=1.0.3 - ES_VERSION=1.0.3 GROOVY_VER=2.0.0
- ES_VERSION=1.1.2 - ES_VERSION=1.1.2 GROOVY_VER=2.0.0
- ES_VERSION=1.2.1 - ES_VERSION=1.2.1 GROOVY_VER=2.2.0
- ES_VERSION=1.3.4
- ES_VERSION=1.4.4
- ES_VERSION=1.5.2
- ES_VERSION=1.6.0
before_script: before_script:
- mkdir ${HOME}/elasticsearch - mkdir ${HOME}/elasticsearch
- wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz - wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
- tar -xzf elasticsearch-${ES_VERSION}.tar.gz -C ${HOME}/elasticsearch - tar -xzf elasticsearch-${ES_VERSION}.tar.gz -C ${HOME}/elasticsearch
- "echo 'script.groovy.sandbox.enabled: true' >> ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/config/elasticsearch.yml"
- 'if [[ "${ES_VERSION}" < "1.3" ]]; then ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/plugin --install elasticsearch/elasticsearch-lang-groovy/${GROOVY_VER}; fi'
- ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/elasticsearch >/dev/null & - ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/elasticsearch >/dev/null &
install: install:

12
goes_test.go
View File

@ -5,13 +5,14 @@
package goes package goes
import ( import (
. "gopkg.in/check.v1"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"strings" "strings"
"testing" "testing"
"time" "time"
. "gopkg.in/check.v1"
) )
var ( var (
@ -787,6 +788,8 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
// gives ES some time to do its job // gives ES some time to do its job
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
_, err = conn.RefreshIndex(indexName)
c.Assert(err, IsNil)
response, err := conn.IndexStatus([]string{"testindexstatus"}) response, err := conn.IndexStatus([]string{"testindexstatus"})
c.Assert(err, IsNil) c.Assert(err, IsNil)
@ -796,9 +799,11 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
primarySizeInBytes := response.Indices[indexName].Index["primary_size_in_bytes"].(float64) primarySizeInBytes := response.Indices[indexName].Index["primary_size_in_bytes"].(float64)
sizeInBytes := response.Indices[indexName].Index["size_in_bytes"].(float64) sizeInBytes := response.Indices[indexName].Index["size_in_bytes"].(float64)
refreshTotal := response.Indices[indexName].Refresh["total"].(float64)
c.Assert(primarySizeInBytes > 0, Equals, true) c.Assert(primarySizeInBytes > 0, Equals, true)
c.Assert(sizeInBytes > 0, Equals, true) c.Assert(sizeInBytes > 0, Equals, true)
c.Assert(refreshTotal > 0, Equals, true)
expectedIndices := map[string]IndexStatus{ expectedIndices := map[string]IndexStatus{
indexName: { indexName: {
@ -824,7 +829,7 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
"total_size_in_bytes": float64(0), "total_size_in_bytes": float64(0),
}, },
Refresh: map[string]interface{}{ Refresh: map[string]interface{}{
"total": float64(1), "total": refreshTotal,
"total_time_in_millis": float64(0), "total_time_in_millis": float64(0),
}, },
Flush: map[string]interface{}{ Flush: map[string]interface{}{
@ -1154,6 +1159,7 @@ func (s *GoesTestSuite) TestUpdate(c *C) {
// Now that we have an ordinary document indexed, try updating it // Now that we have an ordinary document indexed, try updating it
query := map[string]interface{}{ query := map[string]interface{}{
"script": "ctx._source.counter += count", "script": "ctx._source.counter += count",
"lang": "groovy",
"params": map[string]interface{}{ "params": map[string]interface{}{
"count": 5, "count": 5,
}, },
@ -1165,7 +1171,7 @@ func (s *GoesTestSuite) TestUpdate(c *C) {
} }
response, err = conn.Update(d, query, extraArgs) response, err = conn.Update(d, query, extraArgs)
if err != nil && strings.Contains(err.(*SearchError).Msg, "dynamic scripting disabled") { if err != nil && strings.Contains(err.(*SearchError).Msg, "dynamic scripting") {
c.Skip("Scripting is disabled on server, skipping this test") c.Skip("Scripting is disabled on server, skipping this test")
return return
} }