.

wcfs/wcfs.go

@@ -1593,23 +1593,24 @@ func (wlink *WatchLink) _serveRX() (err error) {
 func (wlink *WatchLink) handleWatch(ctx context.Context, stream uint64, msg string) (err error) {
 	defer xerr.Contextf(&err, "%d", stream)
 
-	foid, at, err := parseWatch(msg)
+	err = wlink._handleWatch(ctx, msg)
+	reply := "ok"
 	if err != nil {
-		return err
+		reply = fmt.Sprintf("error %s", err)
 	}
 
-	err = wlink.setupWatch(ctx, foid, at)
-	if err != nil {
-		fmt.Printf("S: watch: QQQ: %s\n", err)
+	err = wlink.send(ctx, stream, reply)
 	return err
-	}
+}
 
-	err = wlink.send(ctx, stream, "ok")
+func (wlink *WatchLink) _handleWatch(ctx context.Context, msg string) error {
+	foid, at, err := parseWatch(msg)
 	if err != nil {
 		return err
 	}
 
-	return nil
+	err = wlink.setupWatch(ctx, foid, at)
+	return err
 }
 
 // sendReq sends wcfs-originated request to client and returns client response.

wcfs/wcfs_test.py

@@ -876,9 +876,9 @@ def test_wcfs():
     # XXX invalid requests -> wcfs replies error
     # XXX -> separate test?
     wl = t.openwatch()
-    assert wl.sendReq(context.background(), b'bla bla') == ""   # XXX -> == None    XXX or error?
+    assert wl.sendReq(context.background(), b'bla bla') == b"error bad watch: not a watch request"
 
-    # assert wl closed
+    # XXX assert wl closed
     wl.close()
 
     for zf in t.zfiles():