Fix races in txnBuf

filter/txnBuf/txnbuf_test.go

Index: filter/txnBuf/txnbuf_test.go
diff --git a/filter/txnBuf/txnbuf_test.go b/filter/txnBuf/txnbuf_test.go
index 6c0845e9d2ec6d1ba32ed4a1ec8425c4fcfc259c..f95730290fde3810ebd0ad17df449917eba6795e 100644
--- a/filter/txnBuf/txnbuf_test.go
+++ b/filter/txnBuf/txnbuf_test.go
@@ -155,7 +155,7 @@ func TestTransactionBuffers(t *testing.T) {
 		So(under.PutMulti.Total(), ShouldEqual, 0)
 		So(over.PutMulti.Total(), ShouldEqual, 0)
 
-		Convey("Good", func() {
+		FocusConvey("Good", func() {

[dnj, 2015/11/11 16:08:28]

Switch back to regular Convey.

 			Convey("read-only", func() {
 				So(ds.RunInTransaction(func(c context.Context) error {
 					ds := datastore.Get(c)
@@ -187,7 +187,7 @@ func TestTransactionBuffers(t *testing.T) {
 				So(4, fooShouldHave(ds), 1, 2, 3, 4)
 			})
 
-			Convey("multi-level read/write", func() {
+			FocusConvey("multi-level read/write", func() {

[dnj, 2015/11/11 16:08:28]

Switch back to regular Convey.

[iannucci, 2015/11/11 18:06:40]

oops, done (for both)

 				So(ds.RunInTransaction(func(c context.Context) error {
 					ds := datastore.Get(c)
 
@@ -247,11 +247,7 @@ func TestTransactionBuffers(t *testing.T) {
 				So(under.PutMulti.Total(), ShouldEqual, 2)
 				So(under.DeleteMulti.Total(), ShouldEqual, 2)
 
-				// 'over' Put operations are amplified because the inner transaction
-				// commits go through the 'over' filter on the outer transaction. So it's
-				// # Puts + # inner txns, times 2 because we are simulating a failed
-				// transaction.
-				So(over.PutMulti.Total(), ShouldEqual, 10)
+				So(over.PutMulti.Total(), ShouldEqual, 8)
 
 				So(7, fooShouldHave(ds))
 				So(3, fooShouldHave(ds), 10, 20, 30, 40)
@@ -838,7 +834,7 @@ func TestQuerySupport(t *testing.T) {
 
 					vals = []*Foo{}
 					So(ds.GetAll(q, &vals), ShouldBeNil)
-					So(vals, ShouldResemble, []*Foo{foo1, projectData[0], foo7})
+					So(vals, ShouldResembleV, []*Foo{foo1, projectData[0], foo7})
 
 					return nil
 				}, nil), ShouldBeNil)
@@ -857,6 +853,7 @@ func TestQuerySupport(t *testing.T) {
 					q := datastore.NewQuery("Foo").Ancestor(root)
 					return ds.Run(q, func(pm datastore.PropertyMap, _ datastore.CursorCB) bool {
 						So(ds.RunInTransaction(func(c context.Context) error {
+							ds := datastore.Get(c)
 							pm["Value"] = append(pm["Value"], datastore.MkProperty("wat"))
 							return ds.Put(pm)
 						}, nil), ShouldBeNil)