From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jarno Malmari Newsgroups: gmane.emacs.devel Subject: [PATCH] Fix potentially hanging url-auth tests Date: Sat, 15 Apr 2017 12:12:44 +0300 Message-ID: <1492247564-13556-1-git-send-email-jarno@malmari.fi> References: <83fuhop8ed.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1492247606 8874 195.159.176.226 (15 Apr 2017 09:13:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 15 Apr 2017 09:13:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 15 11:13:23 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czJlj-0002DP-6E for ged-emacs-devel@m.gmane.org; Sat, 15 Apr 2017 11:13:23 +0200 Original-Received: from localhost ([::1]:55978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czJlp-0007VD-5L for ged-emacs-devel@m.gmane.org; Sat, 15 Apr 2017 05:13:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czJlE-0007V8-6Z for emacs-devel@gnu.org; Sat, 15 Apr 2017 05:12:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1czJlA-00035j-Vy for emacs-devel@gnu.org; Sat, 15 Apr 2017 05:12:52 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58465) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1czJlA-00035Q-HL for emacs-devel@gnu.org; Sat, 15 Apr 2017 05:12:48 -0400 Original-Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A787A20671 for ; Sat, 15 Apr 2017 05:12:46 -0400 (EDT) Original-Received: from frontend2 ([10.202.2.161]) by compute6.internal (MEProxy); Sat, 15 Apr 2017 05:12:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=malmari.fi; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=EHqcLH Ct/t+XlR3F+dpscR/+6yF3S2068GvQrjOIWjg=; b=U408d260BfRLxxM+ePciXS Y4mpxbEpBr52LlUbyFhEeOflWQ06sT80XUUD08gnmj1jaNUHUM+S+l34T+PxhINb sGwzo7t+qXZZHwXUPj2FNhZKBko39dd6NWGw26M7ZgdOs8n74EJAE/FAXgxX/bPG f1lvQBP9rQmcFxeJ9J1zcIVexvTMCLpBSbvLJI5WQvvPTPnRpSDTLKJHXSwJStjR UXHWtVC/3J7n4fnb2V9eD+DRGJRGSw99M5wblFFWGHVW9jk33yGcBSPyvGaw3wFZ UrKXTaBgcD1/KY/hU4ceTU8dAyiTRxk4cu1yZq7OAgJXYXD/ZdmT7lqbHiRUCSwg == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=EHqcLHCt/t+XlR3F+dpscR/+6yF3S2068GvQrjOIW jg=; b=EslWLS0/MtKFcutH+TDD7D2TIvpGAOZQc8WwahQvFd66hRrCELzEdfvI2 70OPOrUyAR/5ShplMBGYXHgjh1IB5CPuWySpxv5FQ1D3gCPe//fNsFB2qh+SLysG QhkcX2bp8p0fmvgvF61dJ4zgIVYso58eXVieX7FhpCgB5EPBQnmnErjfTYCs3TLb d8Y5MVOB9yY8k7JpySRyBeZxhoy0eYx5yeTQegc2P/O3uRmwhOnsF7s3hnU3ShRx LSoTGytYiFbxSSjDk5TOjU1sA8lUuAtvKdlpCkgXcm8AdKVMASWOyG8OmgJPm382 +1KYyo6P953uAMiK3EPMCW6fVTWQw== X-ME-Sender: X-Sasl-enc: iDj4HClgzQw1S9tYW16T/nLLTroDh2i9ZDtWQvul/IPC 1492247566 Original-Received: from vabi.dna.mokkula (37-33-101-23.bb.dnainternet.fi [37.33.101.23]) by mail.messagingengine.com (Postfix) with ESMTPA id 062C024373 for ; Sat, 15 Apr 2017 05:12:45 -0400 (EDT) X-Mailer: git-send-email 2.7.0.25.gfc10eb5 In-Reply-To: <83fuhop8ed.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.25 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213971 Archived-At: * test/lisp/url/url-auth-tests.el (url-auth-test-digest-auth-retrieve-cache): (url-auth-test-digest-auth, url-auth-test-digest-auth-opaque): Set auth-sources variable to nil. --- test/lisp/url/url-auth-tests.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el index 30636db..47aafab 100644 --- a/test/lisp/url/url-auth-tests.el +++ b/test/lisp/url/url-auth-tests.el @@ -137,7 +137,9 @@ url-auth-test-challenges "Check how the entry point retrieves cached authentication. Essential is how realms and paths are matched." - (let* ((url-digest-auth-storage + (let* ((auth-sources nil) ; Don't use any user authinfo files. They + ; may even hang the test run if encrypted. + (url-digest-auth-storage '(("example.org:80" ("/path/auth1" "auth1user" "key") ("/path" "pathuser" "key") @@ -231,7 +233,8 @@ url-auth-test-challenges cnonce is used for generating them which is not mocked by the test and cannot be passed by arguments to `url-digest-auth'." (dolist (challenge url-auth-test-challenges) - (let* ((attrs (append + (let* ((auth-sources nil) ; Don't use any user authinfo files. + (attrs (append (list (cons "nonce" (plist-get challenge :nonce))) (if (plist-get challenge :qop) (list (cons "qop" (plist-get challenge :qop)))))) @@ -276,7 +279,8 @@ url-auth-test-challenges (ert-deftest url-auth-test-digest-auth-opaque () "Check that `opaque' value is added to result when presented by the server." - (let* ((url-digest-auth-storage + (let* ((auth-sources nil) ; Don't use any user authinfo files. + (url-digest-auth-storage '(("example.org:80" ("/" "user" "key")))) (attrs (list (cons "nonce" "anynonce"))) auth) -- 2.7.0.25.gfc10eb5