Skip to content

Commit 3c64acc

Browse files
committed
Fix tests
1 parent e6d16cb commit 3c64acc

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

indexer_test.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,29 @@ import (
1515
"github.com/olivere/elastic"
1616
"github.com/sirupsen/logrus"
1717
"github.com/stretchr/testify/assert"
18+
"github.com/stretchr/testify/require"
1819
)
1920

2021
const elasticURL = "http://localhost:9200"
2122
const indexName = "rp_elastic_test"
2223

2324
func setup(t *testing.T) (*sql.DB, *elastic.Client) {
2425
testDB, err := ioutil.ReadFile("testdb.sql")
25-
assert.NoError(t, err)
26+
require.NoError(t, err)
2627

2728
db, err := sql.Open("postgres", "postgres://temba:temba@localhost:5432/elastic_test?sslmode=disable")
28-
assert.NoError(t, err)
29+
require.NoError(t, err)
2930

3031
_, err = db.Exec(string(testDB))
31-
assert.NoError(t, err)
32+
require.NoError(t, err)
3233

33-
client, err := elastic.NewClient(elastic.SetURL(elasticURL), elastic.SetTraceLog(log.New(os.Stdout, "", log.LstdFlags)))
34-
assert.NoError(t, err)
34+
client, err := elastic.NewClient(elastic.SetURL(elasticURL), elastic.SetTraceLog(log.New(os.Stdout, "", log.LstdFlags)), elastic.SetSniff(false))
35+
require.NoError(t, err)
3536

3637
existing := FindPhysicalIndexes(elasticURL, indexName)
3738
for _, idx := range existing {
3839
_, err = client.DeleteIndex(idx).Do(context.Background())
39-
assert.NoError(t, err)
40+
require.NoError(t, err)
4041
}
4142

4243
logrus.SetLevel(logrus.DebugLevel)
@@ -99,7 +100,11 @@ func TestIndexing(t *testing.T) {
99100
assertQuery(t, client, physicalName, elastic.NewRangeQuery("created_on").Gt("2017-01-01"), []int64{1, 6, 8})
100101

101102
// last_seen_on range query
102-
assertQuery(t, client, physicalName, elastic.NewRangeQuery("last_seen_on").Lt("2019-01-01"), []int64{1, 2, 4, 5})
103+
assertQuery(t, client, physicalName, elastic.NewRangeQuery("last_seen_on").Lt("2019-01-01"), []int64{3, 4})
104+
105+
// last_seen_on is set / not set queries
106+
assertQuery(t, client, physicalName, elastic.NewExistsQuery("last_seen_on"), []int64{1, 2, 3, 4, 5, 6})
107+
assertQuery(t, client, physicalName, elastic.NewBoolQuery().MustNot(elastic.NewExistsQuery("last_seen_on")), []int64{7, 8, 9})
103108

104109
// urn query
105110
query := elastic.NewNestedQuery("urns", elastic.NewBoolQuery().Must(

0 commit comments

Comments
 (0)