Merge pull request #65 from go-kivik/race

Add locking around db name changes to prevent race

Author: flimzy

client_gen.go

@@ -190,7 +190,9 @@ func (c *driverClient) DB(ctx context.Context, arg0 string, options map[string]i
 	if err := c.nextExpectation(expected); err != nil {
 		return nil, err
 	}
+	expected.ret0.mu.Lock()
 	expected.ret0.name = arg0
+	expected.ret0.mu.Unlock()
 	if expected.callback != nil {
 		return expected.callback(ctx, arg0, options)
 	}

dbmock.go

@@ -1,5 +1,7 @@
 package kivikmock
 
+import "sync"
+
 // MockDB is deprecated
 type MockDB = DB
 
@@ -10,6 +12,7 @@ type DB struct {
 	id     int
 	client *Client
 	count  int
+	mu     sync.RWMutex
 }
 
 func (db *DB) expectations() int {

gen/templates/drivermethod.tmpl

@@ -6,7 +6,9 @@ func ({{if .DBMethod}}db *driverDB{{else}}c *driverClient{{end}}) {{ .Name }}({{
 		return {{ .ZeroReturns }}
 	}
 {{- if eq .Name "DB" }}
+expected.ret0.mu.Lock()
 expected.ret0.name = arg0
+expected.ret0.mu.Unlock()
 {{- end }}
     if expected.callback != nil {
 		return expected.callback({{.CallbackArgs}})

meets.go

@@ -27,6 +27,10 @@ func dbMeetsExpectation(a, e *DB) bool {
 	if e == nil {
 		return true
 	}
+	e.mu.RLock()
+	defer e.mu.RUnlock()
+	a.mu.RLock()
+	defer a.mu.RUnlock()
 	return e.name == a.name && e.id == a.id
 }