branch: externals/detached
commit 274993d9c9b6f535bb4d441794ee2b8fc1e82159
Author: Niklas Eklund <niklas.ekl...@posteo.net>
Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Remove 'started state
---
detached.el | 15 +++++++--------
test/detached-test.el | 11 ++++-------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/detached.el b/detached.el
index cf3b3857c1..e341c85ec9 100644
--- a/detached.el
+++ b/detached.el
@@ -938,7 +938,6 @@ This function uses the `notifications' library."
"-n"
,(number-to-string detached-session-context-lines)
,log)))))
- (detached--set-session-state session 'started)
(pcase type
('string (string-join command " "))
('list command)
@@ -1113,7 +1112,7 @@ This function uses the `notifications' library."
(defun detached-session-started-p (session)
"Return t if SESSION has been started."
- (not (eq 'unknown (detached-session-state session))))
+ (eq 'active (detached-session-state session)))
(defun detached-session-validated-p (session)
"Return t if SESSION has been validated."
@@ -1314,7 +1313,7 @@ It can take some time for a dtach socket to be created.
Therefore all
sessions are created with state unknown. This function creates a
function to verify that a session was created correctly. If the
session is missing its deleted from the database."
- (setf (alist-get (detached-session-id session)
detached--unvalidated-sessions)
+ (setf (alist-get (detached--session-id session)
detached--unvalidated-sessions)
session)
(run-with-timer detached-dtach-socket-creation-delay
nil
@@ -1444,10 +1443,10 @@ Optionally make the path LOCAL to host."
(seq-length durations)))))
`(:durations ,durations :mean ,mean :std ,std)))
-(defun detached--set-session-state (session state)
- "Update SESSION with STATE."
- (setf (detached--session-state session) state)
- (detached--db-update-entry session))
+;; (defun detached--set-session-state (session state)
+;; "Update SESSION with STATE."
+;; (setf (detached--session-state session) state)
+;; (detached--db-update-entry session))
;;;;; Database
@@ -1489,7 +1488,7 @@ Optionally make the path LOCAL to host."
(defun detached--db-update-entry (session)
"Update SESSION in `detached--sessions' and the database."
- (setf (alist-get (detached-session-id session) detached--sessions) session)
+ (setf (alist-get (detached--session-id session) detached--sessions) session)
(when detached--update-database
(detached--db-update-sessions)))
diff --git a/test/detached-test.el b/test/detached-test.el
index 3a8e5fcb91..10dd888c3a 100644
--- a/test/detached-test.el
+++ b/test/detached-test.el
@@ -68,15 +68,12 @@
;;;;; Session interface
-(ert-deftest detached-test-set-session-state ()
+(ert-deftest detached-test-session-started-p ()
(detached-test--with-temp-database
(cl-letf* ((session (detached-create-session "foo")))
- (should (eq 'unknown (detached-session-state session)))
- (detached--set-session-state session 'started)
- (should (eq 'started
- (detached-session-state
- (detached--db-get-session
- (detached-session-id session))))))))
+ (should (not (detached-session-started-p session)))
+ (setf (detached--session-state session) 'active)
+ (should (detached-session-started-p session)))))
(ert-deftest detached-test-session-status ()
(let ((failed-session (detached--session-create :status `(failure . 128))))
