diff options
| author | sterni <sternenseemann@systemli.org> | 2023-05-01T16·06+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-05-01T16·17+0000 |
| commit | 1e4b73ac957f30b57800533276a1f571d06f4f62 (patch) | |
| tree | c359331e81296b7a364fca8fe2ba4e6ccfdd782c | |
| parent | 93a6d3d9208197c9d8ce419747ec5c34a9d8d8d1 (diff) | |
refactor(3p/lisp/mime4cl): unify test mechanism for sample msgs r/6122
For whatever reason, there were two sort of identical tests, mime.1 and mime.2, in the mime4cl test suite: The former tested *sample1-file* and the latter all messages *samples-directory*—in the same way, parsing the original and a re-rendered version of the message to check if they were equal. We can just move sample1.msg into *samples-directory*, get rid of *sample1-file* and thus pave the way for more test messages in the future. Change-Id: I843be331682b731af6ae02a4648ba1c64aaf59a5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8546 Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
| -rw-r--r-- | third_party/lisp/mime4cl/default.nix | 6 | ||||
| -rw-r--r-- | third_party/lisp/mime4cl/test/mime.lisp | 15 | ||||
| -rw-r--r-- | third_party/lisp/mime4cl/test/samples/sample1.msg (renamed from third_party/lisp/mime4cl/test/sample1.msg) | 0 |
3 files changed, 4 insertions, 17 deletions
diff --git a/third_party/lisp/mime4cl/default.nix b/third_party/lisp/mime4cl/default.nix index 06831640968f..f276e9f8e77c 100644 --- a/third_party/lisp/mime4cl/default.nix +++ b/third_party/lisp/mime4cl/default.nix @@ -29,10 +29,8 @@ depot.nix.buildLisp.library { (pkgs.writeText "nix-samples.lisp" '' (in-package :mime4cl-tests) - ;; missing from the tarball completely - (defvar *samples-directory* (pathname "/this/does/not/exist")) - ;; override auto discovery which doesn't work in store - (defvar *sample1-file* (pathname "${./test/sample1.msg}")) + ;; override auto discovery which doesn't work in the nix store + (defvar *samples-directory* (pathname "${./test/samples}")) '') ./test/temp-file.lisp ./test/endec.lisp diff --git a/third_party/lisp/mime4cl/test/mime.lisp b/third_party/lisp/mime4cl/test/mime.lisp index 8d9397859994..2b87c9e5a4ff 100644 --- a/third_party/lisp/mime4cl/test/mime.lisp +++ b/third_party/lisp/mime4cl/test/mime.lisp @@ -1,7 +1,7 @@ ;;; mime.lisp --- MIME regression tests ;;; Copyright (C) 2012 by Walter C. Pelissero -;;; Copyright (C) 2021-2022 by the TVL Authors +;;; Copyright (C) 2021-2023 by the TVL Authors ;;; Author: Walter C. Pelissero <walter@pelissero.de> ;;; Project: mime4cl @@ -27,22 +27,11 @@ *load-pathname* #P""))) -(defvar *sample1-file* (make-pathname :defaults #.(or *compile-file-pathname* - *load-pathname*) - :name "sample1" - :type "msg")) - (deftest mime.1 - (let* ((orig (mime-message *sample1-file*)) - (dup (mime-message (with-output-to-string (out) (encode-mime-part orig out))))) - (mime= orig dup)) - t) - -(deftest mime.2 (loop for f in (directory (make-pathname :defaults *samples-directory* :name :wild - :type "txt")) + :type "msg")) do (format t "~A:~%" f) (finish-output) diff --git a/third_party/lisp/mime4cl/test/sample1.msg b/third_party/lisp/mime4cl/test/samples/sample1.msg index 662a9fab341e..662a9fab341e 100644 --- a/third_party/lisp/mime4cl/test/sample1.msg +++ b/third_party/lisp/mime4cl/test/samples/sample1.msg |