nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Disable test for freed disk space that fails on Btrfs. 

This is a follow-up to commit 40e89f5be6.

* tests/store.scm ("dead path can be explicitly collected"): Don't check
that (> freed 0).
* gnu/packages/package-management.scm (guix)[arguments]<#:phases>: Remove
workaround for the same problem.
This commit is contained in:
Marius Bakke 2017-11-21 22:42:56 +01:00
parent d1451fa0d0
commit 953c2de706
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/package-management.scm
View File

@ -182,12 +182,6 @@
(substitute* "tests/guix-environment-container.sh" (substitute* "tests/guix-environment-container.sh"
(("guix environment --version") (("guix environment --version")
"exit 77\n"))) "exit 77\n")))
;; XXX: On some file systems (notably Btrfs), the test
;; for freed disk space after GC may fail. See
;; <https://bugs.gnu.org/29363>.
(substitute* "tests/store.scm"
(("(\\(> freed 0\\))" all)
(string-append ";" all)))
#t)) #t))
(add-before 'check 'set-SHELL (add-before 'check 'set-SHELL
(lambda _ (lambda _

4
tests/store.scm
View File

@ -180,7 +180,9 @@
(random-text) '()))) (random-text) '())))
(let-values (((paths freed) (delete-paths %store (list p)))) (let-values (((paths freed) (delete-paths %store (list p))))
(and (equal? paths (list p)) (and (equal? paths (list p))
(> freed 0) ;; XXX: On some file systems (notably Btrfs), freed
;; may return 0. See <https://bugs.gnu.org/29363>.
;;(> freed 0)
(not (file-exists? p)))))) (not (file-exists? p))))))
(test-assert "add-text-to-store vs. delete-paths" (test-assert "add-text-to-store vs. delete-paths"