From 18d907c0a7785284973d669d8f874d4a1450c939 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 3 Feb 2025 12:51:48 +0100 Subject: [PATCH] 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) --- test/lisp/proced-tests.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lisp/proced-tests.el b/test/lisp/proced-tests.el index 18bcbe13722..4575ae4b607 100644 --- 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)))))) -- 2.39.5