diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-14 00:24:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-14 00:24:24 +0200 |
| commit | 30ce8012cd6265b12f756283633be94a547bf990 (patch) | |
| tree | cfa2c57eb6bc43c0dda8ce1675230656fca18656 /tests | |
| parent | 66ef5411471e8d5f25815b9ab1f360ad56e08544 (diff) | |
| download | patches-30ce8012cd6265b12f756283633be94a547bf990.tar patches-30ce8012cd6265b12f756283633be94a547bf990.tar.gz | |
offload: '{send,receive}-files' wait for completion of the transfer.
Fixes situations where the remote 'guix build' is invoked before the
.drv has been completely copied, as reported at
<https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00174.html>.
In some cases 'send-files' would return before the other end is done
importing the files, and so the subsequent 'guix build' invocation would
just miss the .drv file it refers to.
* guix/utils.scm (call-with-decompressed-port): Don't close PORT.
(call-with-compressed-output-port): Likewise.
* tests/utils.scm ("compressed-output-port + decompressed-port"): Adjust
accordingly.
* guix/scripts/offload.scm (send-files): Add explicit (close-pipe pipe)
call.
(retrieve-files): Likewise.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/utils.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/utils.scm b/tests/utils.scm index 4d2d123c6b..8ad399f75c 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -164,10 +164,12 @@ (false-if-exception (delete-file temp-file)) (test-assert "compressed-output-port + decompressed-port" (let* ((file (search-path %load-path "guix/derivations.scm")) - (data (call-with-input-file file get-bytevector-all))) - (call-with-compressed-output-port 'xz (open-file temp-file "w0b") + (data (call-with-input-file file get-bytevector-all)) + (port (open-file temp-file "w0b"))) + (call-with-compressed-output-port 'xz port (lambda (compressed) (put-bytevector compressed data))) + (close-port port) (bytevector=? data (call-with-decompressed-port 'xz (open-file temp-file "r0b") |