Fix creation of Secret Service items in auth-source

* lisp/auth-source.el (auth-source-secrets-create): Use ´apply'.
(auth-source-secrets-saver): Handle `auth-source-save-behavior'
equal t.

* lisp/net/secrets.el (secrets-get-items): Do not call
`secrets-open-session' here ...
(top): ... but here.

* test/lisp/auth-source-tests.el
(auth-source-test-secrets-create-secret): Bind
`auth-source-save-behavior' to t.  Cleanup.

* test/lisp/net/secrets-tests.el (secrets-test00-availability):
After loading secets.el, a session is already opened.
(secrets-test02-collections, secrets-test03-items)
(secrets-test04-search): Open a new session.

2 files changed, 18 insertions, 3 deletions

diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el
index 2f5a9320b17..1f6737cb7c8 100644
--- a/test/lisp/auth-source-tests.el
+++ b/test/lisp/auth-source-tests.el
@@ -292,6 +292,7 @@
   ;; The "session" collection is temporary for the lifetime of the
   ;; Emacs process.  Therefore, we don't care to delete it.
   (let ((auth-sources '((:source (:secrets "session"))))
+        (auth-source-save-behavior t)
         (host (md5 (concat (prin1-to-string process-environment)
                            (current-time-string))))
         (passwd (md5 (concat (prin1-to-string process-environment)
@@ -315,7 +316,14 @@
                           (funcall auth-passwd)
                         auth-passwd))
     (should (string-equal (plist-get auth-info :user) (user-login-name)))
-    (should (string-equal auth-passwd passwd))))
+    (should (string-equal (plist-get auth-info :host) host))
+    (should (string-equal auth-passwd passwd))
+
+    ;; Cleanup.
+    ;; Should use `auth-source-delete' when implemented for :secrets backend.
+    (secrets-delete-item
+     "session"
+     (format "%s@%s" (plist-get auth-info :user) (plist-get auth-info :host)))))
 
 (provide 'auth-source-tests)
 ;;; auth-source-tests.el ends here
diff --git a/test/lisp/net/secrets-tests.el b/test/lisp/net/secrets-tests.el
index fcc3a2d3e6e..9a61bca4351 100644
--- a/test/lisp/net/secrets-tests.el
+++ b/test/lisp/net/secrets-tests.el
@@ -31,8 +31,9 @@
   :expected-result (if secrets-enabled :passed :failed)
   (should secrets-enabled)
   (should (dbus-ping :session secrets-service))
-  ;; We do not test when there's an open session.
-  (should (secrets-empty-path secrets-session-path)))
+
+  ;; Exit.
+  (secrets--test-close-all-sessions))
 
 (defun secrets--test-get-all-sessions ()
   "Return all object paths for existing secrets sessions."
@@ -88,6 +89,8 @@
 
   (unwind-protect
       (progn
+        (should (secrets-open-session))
+
         ;; There must be at least the collections "Login" and "session".
         (should (member "Login" (secrets-list-collections)))
         (should (member "session" (secrets-list-collections)))
@@ -149,6 +152,8 @@
 
   (unwind-protect
       (let (item-path)
+        (should (secrets-open-session))
+
         ;; There shall be no items in the "session" collection.
         (should-not (secrets-list-items "session"))
         ;; There shall be items in the "Login" collection.
@@ -208,6 +213,8 @@
 
   (unwind-protect
       (progn
+        (should (secrets-open-session))
+
         ;; There shall be no items in the "session" collection.
         (should-not (secrets-list-items "session"))