commit - 12a6df2096ac1cc86b964c6f7bb23efbf324fef8
commit + e48d4e0d3cb3856f19c5fc6a73c4b5a61248110b
blob - dc9b951d064e06126e9b3efa07aab0cab99377a5
blob + a31f0d58dec85ecdd543331d1915738b9f1aa6a2
--- regress/lisp/9p-test/kami-tests.lisp
+++ regress/lisp/9p-test/kami-tests.lisp
@@ -47,9 +47,9 @@
     (let ((*messages-sent* '())
           (root-fid (mount stream root)))
       (9p-clunk stream root-fid)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       (9p-attach stream root)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       t)))
 
 (deftest test-mount (kami-suite)
@@ -67,7 +67,7 @@
           (root-fid (mount stream root)))
       (with-new-fid (path-fid)
         (9p-walk stream root-fid path-fid path)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         t))))
 
 (deftest test-walk (kami-suite)
@@ -85,7 +85,7 @@
       (with-new-fid (saved-root-fid)
         (9p-walk stream root-fid saved-root-fid +nwname-clone+)
         (open-path stream root-fid path)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         t))))
 
 (deftest test-open-path (kami-suite)
@@ -105,7 +105,7 @@
         (9p-walk stream root-fid path-fid path)
         (9p-open stream path-fid)
         (9p-read stream path-fid 0 10)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         t))))
 
 (deftest test-read ((kami-suite) (test-walk))
@@ -143,7 +143,7 @@
            (root-fid        (mount stream root))
            (fid             (open-path stream root-fid path :mode +create-for-read-write+)))
       (9p-write stream fid 0 *remote-test-path-contents*)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       t)))
 
 (deftest test-write ((kami-suite) (test-open-path test-read))
@@ -163,7 +163,7 @@
         (9p-walk stream root-fid saved-root-fid +nwname-clone+)
         (let ((fid (open-path stream root-fid path :mode +create-for-read-write+)))
           (9p-write stream fid 2 +remote-test-path-ovewrwrite-data+)
-          (read-all-pending-message stream)
+          (read-all-pending-messages stream)
           (babel:octets-to-string (slurp-file stream saved-root-fid path)))))))
 
 (defun read-entire-file-as-string (path  &optional (root "/"))
@@ -197,7 +197,7 @@
            (root-fid        (mount stream root))
            (fid             (open-path stream root-fid path :mode +create-for-read-write+)))
       (9p-write stream fid 0 *remote-test-path-contents*)
-      (read-all-pending-message stream))))
+      (read-all-pending-messages stream))))
 
 (deftest test-write-on-directory-fails ((kami-suite) (test-write))
   (assert-condition 9p-error (example-write-fails "/")))
@@ -218,7 +218,7 @@
                :callback (lambda (x data)
                            (declare (ignore x))
                            (setf results (decode-rstat data))))
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       results)))
 
 (deftest test-stat (kami-suite)
@@ -258,10 +258,10 @@
       (with-new-fid (saved-root-fid)
         (9p-walk stream root-fid saved-root-fid +nwname-clone+)
         (9p-create stream root-fid path)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         (9p-clunk stream root-fid)
         (open-path stream saved-root-fid path)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         t))))
 
 (alexandria:define-constant +create-file+ "test-file-create" :test #'string=)
@@ -292,9 +292,9 @@
            (saved-root-fid  (clone-fid stream root-fid))
            (new-path-fid    (create-path stream root-fid path)))
       (9p-write stream new-path-fid 0 *remote-test-path-contents*)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       (9p-clunk stream new-path-fid)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       (babel:octets-to-string (slurp-file stream saved-root-fid path)))))
 
 (defun example-create-path (path &optional (root "/"))
@@ -337,21 +337,21 @@
            (root-fid        (mount stream root)))
       (with-new-fid (dir-fid)
         (9p-walk stream root-fid dir-fid "dir")
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         (9p-clunk stream root-fid)
-        (read-all-pending-message stream)
+        (read-all-pending-messages stream)
         (with-new-fid (subdir-fid)
           (9p-walk stream dir-fid subdir-fid "subdir")
-          (read-all-pending-message stream)
+          (read-all-pending-messages stream)
           (9p-clunk stream dir-fid)
-          (read-all-pending-message stream)
+          (read-all-pending-messages stream)
           (with-new-fid (file-fid)
             (9p-walk stream subdir-fid file-fid "test-file-write")
-            (read-all-pending-message stream)
+            (read-all-pending-messages stream)
             (9p-clunk stream subdir-fid)
-            (read-all-pending-message stream)
+            (read-all-pending-messages stream)
             (9p-open stream file-fid)
-            (read-all-pending-message stream)
+            (read-all-pending-messages stream)
             t))))))
 
 (deftest test-close-parent-fid ((kami-suite) (test-walk))
@@ -406,7 +406,7 @@
                :callback (lambda (x data)
                            (declare (ignore x))
                            (setf res-read-2 data)))
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       (not (mismatch res-read-1 res-read-2)))))
 
 (defun example-directory-children (path &optional (root "/"))
@@ -446,7 +446,7 @@
            (data            (make-huge-data)))
       (9p-write stream fid 0 data)
       (9p-clunk stream fid)
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       (path-info stream saved-root-fid path))))
 
 (deftest test-write-huge-file ((kami-suite) (test-collect-dir-root-children))
@@ -492,7 +492,7 @@
                            (declare (ignore x))
                            (let ((data (decode-read-reply reply nil)))
                              (setf results data))))
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       results)))
 
 (deftest test-read-a-tiny-amount-of-data ((kami-suite) (test-write-huge-file))
@@ -521,7 +521,7 @@
                            (declare (ignore x))
                            (let ((data (decode-read-reply reply nil)))
                              (setf results data))))
-      (read-all-pending-message stream)
+      (read-all-pending-messages stream)
       results)))
 
 (deftest test-read-a-tiny-amount-of-data ((kami-suite) (test-write-huge-file))