kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

tests: Adjust to 'show-manifest-transaction' changes.

Browse Source 
This is a followup to 3e5ab0a7a9399bb098b9ced46bf3cbf4085c6bab.

* tests/ui.scm ("show-manifest-transaction"): Update regexp.
* tests/guix-package.sh: Adjust Emacs regexp in --with-source test.
This commit is contained in:
Ludovic Courtès 2020-03-25 15:37:39 +01:00
parent c74f19d758
commit c136da3fbd
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/guix-package.sh
View File

@ -189,8 +189,7 @@ emacs_tarball="$module_dir/emacs-42.5.9rc7.tar.gz"
touch "$emacs_tarball" touch "$emacs_tarball"
guix package -p "$profile" -i emacs --with-source="$emacs_tarball" -n \ guix package -p "$profile" -i emacs --with-source="$emacs_tarball" -n \
2> "$tmpfile" 2> "$tmpfile"
grep -E 'emacs[[:blank:]]+42\.5\.9rc7[[:blank:]]+.*-emacs-42.5.9rc7' \ grep -E 'emacs[[:blank:]]+42\.5\.9rc7' "$tmpfile"
"$tmpfile"
rm "$emacs_tarball" "$tmpfile" rm "$emacs_tarball" "$tmpfile"
rmdir "$module_dir" rmdir "$module_dir"

4
tests/ui.scm
View File

@ -252,12 +252,12 @@ Second line" 24))
(let* ((m (manifest (list guile-1.8.8))) (let* ((m (manifest (list guile-1.8.8)))
(t (manifest-transaction (install (list guile-2.0.9))))) (t (manifest-transaction (install (list guile-2.0.9)))))
(with-store store (with-store store
(and (string-match "guile\t1.8.8 → 2.0.9" (and (string-match "guile +1.8.8 → 2.0.9"
(with-fluids ((%default-port-encoding "UTF-8")) (with-fluids ((%default-port-encoding "UTF-8"))
(with-error-to-string (with-error-to-string
(lambda () (lambda ()
(show-manifest-transaction store m t))))) (show-manifest-transaction store m t)))))
(string-match "guile\t1.8.8 -> 2.0.9" (string-match "guile +1.8.8 -> 2.0.9"
(with-error-to-string (with-error-to-string
(lambda () (lambda ()
;; In Guile 2.2, %DEFAULT-PORT-ENCODING doesn't ;; In Guile 2.2, %DEFAULT-PORT-ENCODING doesn't