From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSYpt-0005Kk-Qf for guix-patches@gnu.org; Mon, 11 Jun 2018 22:15:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSYpq-00017P-I1 for guix-patches@gnu.org; Mon, 11 Jun 2018 22:15:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35953) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSYpq-00016h-9B for guix-patches@gnu.org; Mon, 11 Jun 2018 22:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fSYpp-0007hk-Uf for guix-patches@gnu.org; Mon, 11 Jun 2018 22:15:01 -0400 Subject: [bug#26647] Upgrade fabric to 1.13.2, remove upstreamed patch. Resent-Message-ID: References: <87fugxky57.fsf@sturm.com.au> <871ssgsk0e.fsf@elephly.net> <878tmom2tu.fsf@sturm.com.au> <87r2vqxcfx.fsf@gnu.org> <87k21cr6i9.fsf@gumble.sturm.com.au> <87bmkefdve.fsf@sturm.com.au> <878tfiqk0d.fsf@elephly.net> <87o9ni9eo2.fsf@sturm.com.au> <87lgbngqxh.fsf@member.fsf.org> From: Ben Sturmfels In-reply-to: <87lgbngqxh.fsf@member.fsf.org> Date: Tue, 12 Jun 2018 12:14:05 +1000 Message-ID: <87lgbk3g5u.fsf@sturm.com.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Cc: 26647-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi 宋文武, Ben Sturmfels Sturm Software Engineering www.sturm.com.au (03) 9024 2467 On Sun, 10 Jun 2018, 宋文武 wrote: > Ben Sturmfels writes: > >> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c Mon Sep 17 00:00:00 2001 >> From: Ben Sturmfels >> 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-fabric-Disable-problematic-tests.patch >From ace313161f2a3c8fda198b7bf5f7be91c9de4945 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 7 Nov 2017 23:37:38 +1100 Subject: [PATCH] gnu: fabric: Disable problematic tests. Reported by Ricardo Wurmus at . * 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 --=-=-=--