.

go/internal/xtesting/xtesting.go

@@ -275,10 +275,7 @@ func checkLoad(t *testing.T, zdrv zodb.IStorageDriver, xid zodb.Xid, expect objS
 //
 // txnvOk is what data to expect to be in the database.
 func DrvTestLoad(t *testing.T, zdrv zodb.IStorageDriver, txnvOk []Txn, bugv ...string) {
-	bugs := map[string]bool{}
-	for _, bug := range bugv {
-		bugs[bug] = true
-	}
+	bugs := argv2map(bugv)
 
 	// current knowledge of what was "before" for an oid as we scan over
 	// data base entries
@@ -332,9 +329,13 @@ func DrvTestLoad(t *testing.T, zdrv zodb.IStorageDriver, txnvOk []Txn, bugv ...s
 }
 
 // DrvTestWatch verifies that storage driver watcher can observe commits done from outside.
-func DrvTestWatch(t *testing.T, zurl string, zdrvOpen zodb.DriverOpener) {
+func DrvTestWatch(t *testing.T, zurl string, zdrvOpen zodb.DriverOpener, bugv ...string) {
 	X := FatalIf(t)
+	bugs := argv2map(bugv)
 
+	if bugs["nocommit"] {
+		t.Skip("skipping: server does not implement commit")
+	}
 	NeedPy(t, "zodbtools")
 
 	u, err := url.Parse(zurl); X(err)
@@ -455,6 +456,16 @@ func FatalIf(t *testing.T) func(error) {
 	}
 }
 
+// argv2map converts ...string to map[string]bool.
+// it is handy to use e.g. to convert ...bugv to bugs {}.
+func argv2map(argv []string) map[string]bool {
+	dict := map[string]bool{}
+	for _, arg := range argv {
+		dict[arg] = true
+	}
+	return dict
+}
+
 
 // b is syntactic sugar for byte literals.
 //

go/neo/client_test.go

@@ -525,7 +525,7 @@ func TestLoad(t *testing.T) {
 
 func TestWatch(t *testing.T) {
 	withNEOSrv(t, func(t *testing.T, nsrv NEOSrv) {
-		xtesting.DrvTestWatch(t, nsrv.URL(), openClientByURL)
+		xtesting.DrvTestWatch(t, nsrv.URL(), openClientByURL, nsrv.Bugs()...)
 	})
 }