[bug#32394] [PATCH] gnu: restic: Fix tests.

[bug#32394] [PATCH] gnu: restic: Fix tests.

[Oleg Pykhalov]

* gnu/packages/backup.scm (restic)[arguments]: Replace 'check' phase.
---
 gnu/packages/backup.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 0733d9c34..bca070d3f 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -850,6 +850,9 @@ is like a time machine for your data. ")
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/restic/restic"
+       #:modules ((srfi srfi-26)
+                  (guix build go-build-system)
+                  (guix build utils))
        #:unpack-path "github.com/restic"
       ;; We don't need to install the source code for end-user applications.
        #:install-source? #f
@@ -862,6 +865,18 @@ is like a time machine for your data. ")
                                         ,version)
                (invoke "go" "run" "build.go"))))
 
+         (replace 'check
+           (lambda _
+             (with-directory-excursion (string-append
+                                        "src/github.com/restic/restic-"
+                                        ,version)
+               (for-each (cut delete-file <>)
+                         '(;; Requires a network.
+                           "internal/backend/rest/rest_int_test.go"
+                           ;; unexpected error: fusermount: exit status 1
+                           "cmd/restic/integration_fuse_test.go"))
+               (invoke "go" "run" "build.go" "--test"))))
+
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
-- 
2.18.0

[bug#32394] [PATCH] gnu: restic: Fix tests.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

On Wed, Aug 08, 2018 at 08:29:06AM +0300, Oleg Pykhalov wrote:
> * gnu/packages/backup.scm (restic)[arguments]: Replace 'check' phase.

Thanks, LGTM! Should we report the issues upstream?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#32394] [PATCH] gnu: restic: Fix tests.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 461 bytes --]

Hello Leo,

Thank you for review.

Leo Famulari <leo@famulari.name> writes:

> On Wed, Aug 08, 2018 at 08:29:06AM +0300, Oleg Pykhalov wrote:
>> * gnu/packages/backup.scm (restic)[arguments]: Replace 'check' phase.
>
> Thanks, LGTM! Should we report the issues upstream?

I've played little bit more and found that
‘internal/backend/rest/rest_int_test.go’ is actually passes.

Pushed 4976ebddf1a4735ee12808083876f573121993bf as with changes:

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Don't remove internal/backend/rest/rest_int_test.go --]
[-- Type: text/x-patch, Size: 1388 bytes --]

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index bca070d3f..251dadf84 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -850,9 +850,6 @@ is like a time machine for your data. ")
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/restic/restic"
-       #:modules ((srfi srfi-26)
-                  (guix build go-build-system)
-                  (guix build utils))
        #:unpack-path "github.com/restic"
       ;; We don't need to install the source code for end-user applications.
        #:install-source? #f
@@ -870,11 +867,8 @@ is like a time machine for your data. ")
              (with-directory-excursion (string-append
                                         "src/github.com/restic/restic-"
                                         ,version)
-               (for-each (cut delete-file <>)
-                         '(;; Requires a network.
-                           "internal/backend/rest/rest_int_test.go"
-                           ;; unexpected error: fusermount: exit status 1
-                           "cmd/restic/integration_fuse_test.go"))
+               ;; unexpected error: fusermount: exit status 1
+               (delete-file "cmd/restic/integration_fuse_test.go")
                (invoke "go" "run" "build.go" "--test"))))
 
          (replace 'install

[-- Attachment #1.3: Type: text/plain, Size: 126 bytes --]


I'm not sure about reporting to upstream, because I think fusermount
fail in a build process is Guix specific.  WDYT?

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#32394] [PATCH] gnu: restic: Fix tests.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

On Wed, Aug 08, 2018 at 08:58:32PM +0300, Oleg Pykhalov wrote:
> I'm not sure about reporting to upstream, because I think fusermount
> fail in a build process is Guix specific.  WDYT?

Agreed, if it's really specific to Guix then I think we should not report
it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#32394] [PATCH] gnu: restic: Fix tests.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Wed, Aug 08, 2018 at 08:58:32PM +0300, Oleg Pykhalov wrote:
>> I'm not sure about reporting to upstream, because I think fusermount
>> fail in a build process is Guix specific.  WDYT?
>
> Agreed, if it's really specific to Guix then I think we should not report
> it.

OK, then I close the bug report.

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]