From 9a1e6e1905a3a246ff880ff168636bdb2cd6c69d Mon Sep 17 00:00:00 2001
From: Marty Schoch <marty.schoch@gmail.com>
Date: Tue, 9 Feb 2016 13:33:11 -0500
Subject: [PATCH] fix some test failures on windows

---
 examples_test.go |  6 ++++++
 index_test.go    | 32 ++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/examples_test.go b/examples_test.go
index 8603e6c9..edb0774e 100644
--- a/examples_test.go
+++ b/examples_test.go
@@ -28,6 +28,12 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 	toRun := m.Run()
+	if example_index != nil {
+		err = example_index.Close()
+		if err != nil {
+			panic(err)
+		}
+	}
 	err = os.RemoveAll("path_to_index")
 	if err != nil {
 		panic(err)
diff --git a/index_test.go b/index_test.go
index 8f6ff6ee..b56fb958 100644
--- a/index_test.go
+++ b/index_test.go
@@ -593,6 +593,12 @@ func TestBatchString(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		err := index.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}()
 
 	batch := index.NewBatch()
 	err = batch.Index("a", []byte("{}"))
@@ -634,12 +640,24 @@ func TestIndexMetadataRaceBug198(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		err := index.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}()
 
+	done := make(chan struct{})
 	go func() {
 		for {
-			_, err := index.DocCount()
-			if err != nil {
-				t.Fatal(err)
+			select {
+			case <-done:
+				return
+			default:
+				_, err := index.DocCount()
+				if err != nil {
+					t.Fatal(err)
+				}
 			}
 		}
 	}()
@@ -655,7 +673,7 @@ func TestIndexMetadataRaceBug198(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-
+	close(done)
 }
 
 func TestIndexCountMatchSearch(t *testing.T) {
@@ -1122,6 +1140,12 @@ func TestIndexEmptyDocId(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		err := index.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}()
 
 	doc := map[string]interface{}{
 		"body": "nodocid",