diff options
| author | Thomas Fitzsimmons | 2022-11-19 11:39:21 -0500 |
|---|---|---|
| committer | Thomas Fitzsimmons | 2022-11-19 11:43:30 -0500 |
| commit | 2ec39734ca03e075f2515f178ed789872e52f98f (patch) | |
| tree | 4403f9fd9e01e7860ff2b53e8f9555d10ca9b07d | |
| parent | 740fe3e7575a2f9bb0288eaa7f81b97173b00f6a (diff) | |
| download | emacs-2ec39734ca03e075f2515f178ed789872e52f98f.tar.gz emacs-2ec39734ca03e075f2515f178ed789872e52f98f.zip | |
EUDC: Add BBDB test
* test/lisp/net/eudc-tests.el (eudcb-ldap): Call skip-unless with
slapd check.
(eudcb-bbdb): New test.
| -rw-r--r-- | test/lisp/net/eudc-resources/bbdb | 3 | ||||
| -rw-r--r-- | test/lisp/net/eudc-tests.el | 54 |
2 files changed, 39 insertions, 18 deletions
diff --git a/test/lisp/net/eudc-resources/bbdb b/test/lisp/net/eudc-resources/bbdb new file mode 100644 index 00000000000..b730bb51cc9 --- /dev/null +++ b/test/lisp/net/eudc-resources/bbdb | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | ;; -*- mode: Emacs-Lisp; coding: utf-8; -*- | ||
| 2 | ;;; file-format: 9 | ||
| 3 | ["Emacs" "ERT3" nil nil nil nil nil ("emacs-ert-test-3@bbdb.gnu.org") ((notes . " ")) "c8bd3a63-3a83-48a7-a95b-be118a923e00" "2022-11-19 16:36:04 +0000" "2022-11-19 16:36:04 +0000" nil] | ||
diff --git a/test/lisp/net/eudc-tests.el b/test/lisp/net/eudc-tests.el index 59dce55b820..212db65cb26 100644 --- a/test/lisp/net/eudc-tests.el +++ b/test/lisp/net/eudc-tests.el | |||
| @@ -270,24 +270,42 @@ Karl Fogel <kfogel@mail-abbrev.com"))))))))) | |||
| 270 | (require 'ldap) | 270 | (require 'ldap) |
| 271 | (ert-deftest eudcb-ldap () | 271 | (ert-deftest eudcb-ldap () |
| 272 | "Test the LDAP back-end." | 272 | "Test the LDAP back-end." |
| 273 | (when (and (file-exists-p "/usr/sbin/slapd") | 273 | (skip-unless (and (file-exists-p "/usr/sbin/slapd") |
| 274 | (file-exists-p "/usr/bin/ldapsearch")) | 274 | (file-exists-p "/usr/bin/ldapsearch"))) |
| 275 | (cd (concat (ert-resource-directory) "..")) | 275 | (cd (concat (ert-resource-directory) "..")) |
| 276 | (let ((ldap-process | 276 | (let ((ldap-process |
| 277 | (start-process "slapd" "*slapd*" "/usr/sbin/slapd" | 277 | (start-process "slapd" "*slapd*" "/usr/sbin/slapd" |
| 278 | "-h" "ldap://127.0.0.1:3899" "-d" "0" "-4" | 278 | "-h" "ldap://127.0.0.1:3899" "-d" "0" "-4" |
| 279 | "-f" (ert-resource-file "slapd.conf"))) | 279 | "-f" (ert-resource-file "slapd.conf"))) |
| 280 | (ldap-host-parameters-alist '(("ldap://localhost:3899" | 280 | (ldap-host-parameters-alist '(("ldap://localhost:3899" |
| 281 | base "dc=gnu,dc=org" auth simple))) | 281 | base "dc=gnu,dc=org" auth simple))) |
| 282 | (eudc-server-hotlist '(("ldap://localhost:3899" . ldap))) | 282 | (eudc-server-hotlist '(("ldap://localhost:3899" . ldap))) |
| 283 | (eudc-ignore-options-file t)) | 283 | (eudc-ignore-options-file t)) |
| 284 | (sleep-for 1) ; Wait for slapd to start. | 284 | (sleep-for 1) ; Wait for slapd to start. |
| 285 | (should (equal (with-temp-buffer | 285 | (should (equal (with-temp-buffer |
| 286 | (insert "emacs-ert-test-1") | 286 | (insert "emacs-ert-test-1") |
| 287 | (eudc-expand-try-all) | 287 | (eudc-expand-try-all) |
| 288 | (buffer-string)) | 288 | (buffer-string)) |
| 289 | "Emacs ERT1 <emacs-ert-test-1@ldap.gnu.org>")) | 289 | "Emacs ERT1 <emacs-ert-test-1@ldap.gnu.org>")) |
| 290 | (kill-process ldap-process)))) | 290 | (kill-process ldap-process))) |
| 291 | |||
| 292 | (eval-and-compile | ||
| 293 | (push (expand-file-name "../elpa/packages/bbdb/lisp" source-directory) | ||
| 294 | load-path) | ||
| 295 | (defvar bbdb-file) | ||
| 296 | (require 'bbdb nil t)) | ||
| 297 | |||
| 298 | (ert-deftest eudcb-bbdb () | ||
| 299 | "Test the BBDB back-end." | ||
| 300 | (skip-unless (featurep 'bbdb)) | ||
| 301 | (let ((bbdb-file (ert-resource-file "bbdb")) | ||
| 302 | (eudc-server-hotlist '(("" . bbdb))) | ||
| 303 | (eudc-ignore-options-file t)) | ||
| 304 | (should (equal (with-temp-buffer | ||
| 305 | (insert "emacs-ert-test-3") | ||
| 306 | (eudc-expand-try-all) | ||
| 307 | (buffer-string)) | ||
| 308 | "Emacs ERT3 <emacs-ert-test-3@bbdb.gnu.org>")))) | ||
| 291 | 309 | ||
| 292 | (provide 'eudc-tests) | 310 | (provide 'eudc-tests) |
| 293 | ;;; eudc-tests.el ends here | 311 | ;;; eudc-tests.el ends here |