From 6cc21346dcbbcb58140680ba1494678ff57f0b86 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Mon, 19 Oct 2015 14:27:03 -0400 Subject: [PATCH] fix errcheck issues --- index/upside_down/dump_test.go | 7 +- index/upside_down/field_dict_test.go | 7 +- index/upside_down/reader_test.go | 14 +++- index/upside_down/upside_down_test.go | 105 ++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 19 deletions(-) diff --git a/index/upside_down/dump_test.go b/index/upside_down/dump_test.go index 277bce51..5547366e 100644 --- a/index/upside_down/dump_test.go +++ b/index/upside_down/dump_test.go @@ -20,7 +20,12 @@ import ( ) func TestDump(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) diff --git a/index/upside_down/field_dict_test.go b/index/upside_down/field_dict_test.go index 1a0864b5..82f56fb4 100644 --- a/index/upside_down/field_dict_test.go +++ b/index/upside_down/field_dict_test.go @@ -19,7 +19,12 @@ import ( ) func TestIndexFieldDict(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) diff --git a/index/upside_down/reader_test.go b/index/upside_down/reader_test.go index 456e2039..72c7ccc9 100644 --- a/index/upside_down/reader_test.go +++ b/index/upside_down/reader_test.go @@ -19,7 +19,12 @@ import ( ) func TestIndexReader(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -189,7 +194,12 @@ func TestIndexReader(t *testing.T) { } func TestIndexDocIdReader(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) diff --git a/index/upside_down/upside_down_test.go b/index/upside_down/upside_down_test.go index 6a9853d4..d4a3efd1 100644 --- a/index/upside_down/upside_down_test.go +++ b/index/upside_down/upside_down_test.go @@ -33,7 +33,12 @@ var testAnalyzer = &analysis.Analyzer{ } func TestIndexOpenReopen(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -87,7 +92,12 @@ func TestIndexOpenReopen(t *testing.T) { } func TestIndexInsert(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -142,7 +152,12 @@ func TestIndexInsert(t *testing.T) { } func TestIndexInsertThenDelete(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -233,7 +248,12 @@ func TestIndexInsertThenDelete(t *testing.T) { } func TestIndexInsertThenUpdate(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -296,7 +316,12 @@ func TestIndexInsertThenUpdate(t *testing.T) { } func TestIndexInsertMultiple(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -375,7 +400,12 @@ func TestIndexInsertMultiple(t *testing.T) { } func TestIndexInsertWithStore(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -457,7 +487,12 @@ func TestIndexInsertWithStore(t *testing.T) { } func TestIndexInternalCRUD(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -546,7 +581,12 @@ func TestIndexInternalCRUD(t *testing.T) { } func TestIndexBatch(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -639,7 +679,12 @@ func TestIndexBatch(t *testing.T) { } func TestIndexInsertUpdateDeleteWithMultipleTypesStored(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -827,7 +872,12 @@ func TestIndexInsertUpdateDeleteWithMultipleTypesStored(t *testing.T) { } func TestIndexInsertFields(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -882,7 +932,12 @@ func TestIndexInsertFields(t *testing.T) { } func TestIndexUpdateComposites(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -974,7 +1029,12 @@ func TestIndexUpdateComposites(t *testing.T) { } func TestIndexFieldsMisc(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -1016,7 +1076,12 @@ func TestIndexFieldsMisc(t *testing.T) { } func TestIndexTermReaderCompositeFields(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -1072,7 +1137,12 @@ func TestIndexTermReaderCompositeFields(t *testing.T) { } func TestIndexDocumentFieldTerms(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue) @@ -1159,7 +1229,12 @@ func BenchmarkBatch(b *testing.B) { } func TestConcurrentUpdate(t *testing.T) { - defer DestroyTest() + defer func() { + err := DestroyTest() + if err != nil { + t.Fatal(err) + } + }() analysisQueue := index.NewAnalysisQueue(1) idx, err := NewUpsideDownCouch(boltdb.Name, boltTestConfig, analysisQueue)