error to user-error and gets tests working

masukomi · Mar 30, 2022 · 57eb1ba · 57eb1ba
1 parent 3b134fa
commit 57eb1ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
       id: cache-local-bin
       with:
         path: $HOME/.local/bin
-        key: cache-local-bin-000
+        key: cache-local-bin-001
 
     - uses: actions/cache@v2
       id: cache-cask-executable

diff --git a/private-comments-mode.el b/private-comments-mode.el
@@ -153,8 +153,7 @@ numerical port, e.g., 5749, which assumes
     (unless (ping 1)
       (if (y-or-n-p "PC Server not running. Run now? ")
           (private-comments--run-server)
-        (let (debug-on-error)
-          (error "`private-comments-ensure-server': quit"))))
+        (user-error "`private-comments-ensure-server': quit")))
     (unless (ping 5)
       (error "`private-comments-ensure-server': could not start server"))))
 
@@ -435,7 +434,7 @@ An uncommitted change cannot be privately commented."
         #'private-comments--generic-callback
         (current-buffer))
        nil t)
-    (error "No private comment found")))
+    (user-error "No private comment found")))
 
 (defsubst private-comments--uncommitted (commit)
   "Predicate whether COMMIT hash is committed."
@@ -455,7 +454,7 @@ An uncommitted change cannot be privately commented."
                   (aref blame-data line-number)))
          (commit (plist-get blame :commit)))
     (if (private-comments--uncommitted commit)
-        (error "Line %s is uncommitted" line-number)
+        (user-error "Line %s is uncommitted" line-number)
       (private-comments-edit
        (apply-partially #'private-comments--edit-callback-4
                         (current-buffer)

diff --git a/tests/private-comments-mode-test.el b/tests/private-comments-mode-test.el
@@ -17,6 +17,15 @@
 (setenv "PRIVATE_COMMENTS_PORT"
         (number-to-string (url-port (url-generic-parse-url private-comments-url))))
 
+(when (getenv "CI")
+  (cl-assert
+   (zerop
+    (apply #'call-process "git" nil nil nil
+           (split-string "config --global user.email foo@example.com"))))
+  (cl-assert
+   (zerop (apply #'call-process "git" nil nil nil
+                 (split-string "config --global user.name his_fooness")))))
+
 (defun pcm-test-wait-for (predicate &optional predargs ms interval continue)
   "Wait until PREDICATE function returns non-`nil'.
   PREDARGS is argument list for the PREDICATE function.