From 1397b422e254929de1805aaf1d0759cd5da6a60b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Apr 2017 11:39:49 +0200 Subject: store: 'GUIX_DAEMON_SOCKET' can now be a URI. * guix/store.scm (%daemon-socket-file): Rename to... (%daemon-socket-uri): ... this. (connect-to-daemon): New procedure. (open-connection): Rename 'file' to 'uri'. Use 'connect-to-daemon' instead of 'open-unix-domain-socket'. * guix/tests.scm (open-connection-for-tests): Rename 'file' to 'uri'. * tests/guix-build.sh: Add tests. * tests/store.scm ("open-connection with file:// URI"): New tests. --- tests/store.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/store.scm') diff --git a/tests/store.scm b/tests/store.scm index 45150d36ca..3eb8b7be5a 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -48,6 +48,14 @@ (test-begin "store") +(test-assert "open-connection with file:// URI" + (let ((store (open-connection (string-append "file://" + (%daemon-socket-uri))))) + (and (add-text-to-store store "foo" "bar") + (begin + (close-connection store) + #t)))) + (test-equal "connection handshake error" EPROTO (let ((port (%make-void-port "rw"))) -- cgit 1.4.1 From 1a0adad83f804d1d7190af7accb58284e4c69e3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 7 May 2017 00:16:01 +0200 Subject: tests: Corrupt archive import test is robust against different store prefixes. * tests/store.scm ("import corrupt path"): Set 'index' to #x70. --- tests/store.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/store.scm') diff --git a/tests/store.scm b/tests/store.scm index 3eb8b7be5a..45aeb329b0 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -758,8 +758,9 @@ (cut export-paths %store (list file) <>)))) (delete-paths %store (list file)) - ;; Flip a bit in the stream's payload. - (let* ((index (quotient (bytevector-length dump) 4)) + ;; Flip a bit in the stream's payload. INDEX here falls in the middle of + ;; the file contents in DUMP, regardless of the store prefix. + (let* ((index #x70) (byte (bytevector-u8-ref dump index))) (bytevector-u8-set! dump index (logxor #xff byte))) -- cgit 1.4.1