Better NaN handling in proced-tests.el

* test/lisp/proced-tests.el (proced--cpu-at-point): Make it more robust.
(proced--assert-process-valid-cpu-refinement):
Handle `ert-test-skipped' signal.

(cherry picked from commit fbc13ba9ccf4590ccd15dafa35d3872807af9cbd)

diff --git a/test/lisp/proced-tests.el b/test/lisp/proced-tests.el
index 18bcbe137229564c82bcbb290c9b647cb2293ea9..4575ae4b6077b9612a54d8813a1be17156f5500b 100644 (file)
--- a/test/lisp/proced-tests.el
+++ b/test/lisp/proced-tests.el
@@ -40,10 +40,10 @@
 (defun proced--cpu-at-point ()
   "Return as an integer the current CPU value at point."
   (if (string-suffix-p "nan" (thing-at-point 'sexp))
-      (let ((pid (proced-pid-at-point)))
-        (ert-skip
-         (format
-          "Found NaN value for %%CPU at point for process with PID %d" pid)))
+      (ert-skip
+       (format
+        "Found NaN value for %%CPU at point for process with PID %s"
+        (substring-no-properties (thing-at-point 'sexp))))
     (thing-at-point 'number)))
 
 (defun proced--assert-emacs-pid-in-buffer ()
@@ -63,6 +63,7 @@
   (proced--move-to-column "%CPU")
   (condition-case err
       (>= (proced--cpu-at-point) cpu)
+    (ert-test-skipped (signal (car err) (cdr err)))
     (error
      (ert-fail
       (list err (proced--assert-process-valid-cpu-refinement-explainer cpu))))))