[bug#26647] Upgrade fabric to 1.13.2, remove upstreamed patch.

[Ben Sturmfels <ben@sturm.com.au>]

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

Hi 宋文武,



Ben Sturmfels

Sturm Software Engineering
www.sturm.com.au
(03) 9024 2467

On Sun, 10 Jun 2018, 宋文武 wrote:

> Ben Sturmfels <ben@sturm.com.au> writes:
>
>> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c Mon Sep 17 00:00:00 2001
>> From: Ben Sturmfels <ben@sturm.com.au>
>> Date: Tue, 7 Nov 2017 23:37:38 +1100
>> Subject: [PATCH] gnu: fabric: Update to 1.14.0 and disable problematic tests.
>>
>> * gnu/packages/admin.scm (fabric): Update to 1.14.0 and add custom check phase to disable two tests.
>
> Well, this patch no longer needed, as we already had fabric-1.14.0.
>
> closing now, Thank you!

Thanks for following up on this. I believe that the patch to disable two
tests is still required though to address Ricardo's earlier issues with
tests timing out.

I've attached again without the upgrade to 0.14.0.

Regards,
Ben

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-fabric-Disable-problematic-tests.patch --]
[-- Type: text/x-patch, Size: 2012 bytes --]

From ace313161f2a3c8fda198b7bf5f7be91c9de4945 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 7 Nov 2017 23:37:38 +1100
Subject: [PATCH] gnu: fabric: Disable problematic tests.

Reported by Ricardo Wurmus <rekado@elephly.net> at
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26647#8>.

* gnu/packages/admin.scm (fabric): Add custom check phase to disable two tests.
---
 gnu/packages/admin.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6b8df3fb9..c1acfce8e 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2359,11 +2359,24 @@ Intel DRM Driver.")
          "13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1"))))
     (build-system python-build-system)
     (arguments
-     `(#:python ,python-2))             ; Python 2 only
+     `(#:python ,python-2               ; Python 2 only
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (zero?
+              (system*
+               "nosetests" "-v" "tests/"
+               ;; This test hangs indefinitely when run on a single core VM
+               ;; (see GNU bug #26647 and Debian bug #850230).
+               "--exclude=test_nested_execution_with_explicit_ports"
+               ;; This test randomly fails in certain environments causing too
+               ;; much noise to be useful (see Debian bug #854686).
+               "--exclude=test_should_use_sentinel_for_tasks_that_errored")))))))
     (native-inputs
-     `(("python2-fudge" ,python2-fudge)
-       ("python2-jinja2" ,python2-jinja2)
-       ("python2-nose" ,python2-nose)
+     `(("python2-fudge" ,python2-fudge) ; Requires < 1.0
+       ("python2-jinja2" ,python2-jinja2) ; Requires < 3.0
+       ("python2-nose" ,python2-nose) ; Requires < 2.0
        ("python2-pynacl" ,python2-pynacl)
        ("python2-bcrypt" ,python2-bcrypt)))
     (propagated-inputs
-- 
2.17.0