From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GF8IMfdv/18EVwAA0tVLHw (envelope-from ) for ; Wed, 13 Jan 2021 22:11:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4OZ6LPdv/19tUgAAbx9fmQ (envelope-from ) for ; Wed, 13 Jan 2021 22:11:03 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 149C19402A2 for ; Wed, 13 Jan 2021 22:11:03 +0000 (UTC) Received: from localhost ([::1]:58186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzoM2-00015O-09 for larch@yhetil.org; Wed, 13 Jan 2021 17:11:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzoKz-00015F-5s for emacs-orgmode@gnu.org; Wed, 13 Jan 2021 17:09:57 -0500 Received: from het.cgarbs.de ([159.69.148.42]:60052 helo=mail2.cgarbs.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzoKt-0001Vp-C8 for emacs-orgmode@gnu.org; Wed, 13 Jan 2021 17:09:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=cgarbs.de; s=s20190610h; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3rvG+FETZPgCmzOYvseHytPxT8HTfpIKRG1qn47Rqgc=; b=oF+e9HjSFuKT/ZsthhjwE0pLvd dHLmpR5dvUu5mL+ZT/QS3HLzfCR/JOtuldm2zGd7B/D4vuflS8T+PPaLFOrrrW4D5n/anfikVF1Gd tIGAQok85Ov2laiwT9x1KRIXnBzJmHQl1nl6JomQ8e9soqvSvAD0f/t2UXuzeMvMbnDSPz115uUWS 0GSl1TC5qrsiC6g8uyxPGsmDil8A2HP3/HKjB3umEDeSLsegBVCW/y/fIx3fyfJLzRMaPFgAxw3LS QbJ5ZNV1OaUObjm9uS3NE36MYxGQkwuwDBYtEOq0+GoiOA0VXiKBnTXAo031vyL3FbwDd+btB4sbh jdyVo5eg==; Received: from localhost ([127.0.0.1] helo=mail.cgarbs.de) by mail2.cgarbs.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kzoKl-001QiV-Lv for emacs-orgmode@gnu.org; Wed, 13 Jan 2021 23:09:45 +0100 Received: from [2003:f9:e704:d900:e031:c077:46d:e9a9] (helo=derpy) by mail.cgarbs.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kzoKi-001JCU-55 for emacs-orgmode@gnu.org; Wed, 13 Jan 2021 23:09:43 +0100 Received: from mitch by derpy with local (Exim 4.92) (envelope-from ) id 1kzoKh-002Jau-Eh for emacs-orgmode@gnu.org; Wed, 13 Jan 2021 23:09:39 +0100 Date: Wed, 13 Jan 2021 23:09:39 +0100 To: emacs-orgmode@gnu.org Subject: [PATCH] testing/lisp/test-org-archive.el: Fix test Message-ID: <20210113220939.sbkhyefniyvsypah@cgarbs.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="q32cnevfijilozuy" Content-Disposition: inline User-Agent: NeoMutt/20180716 Received-SPF: pass client-ip=159.69.148.42; envelope-from=mitch@cgarbs.de; helo=mail2.cgarbs.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" Reply-to: Christian Garbs From: Christian Garbs via "General discussions about Org-mode." X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.86 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=cgarbs.de header.s=s20190610h header.b=oF+e9HjS; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 149C19402A2 X-Spam-Score: -2.86 X-Migadu-Scanner: scn0.migadu.com X-TUID: Q7VZ5zUplstb --q32cnevfijilozuy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, I've run across a test error on the current HEAD. When I run "make test" on my system, then test-org-archive/datetree fails. The test fails because the expected output should contain "Sunday", but with a German locale the generated text is "Sonntag" instead (which is the German translation of "Sunday"). The attached patch fixed the test for me. Best regards Christian -- ....Christian.Garbs....................................https://www.cgarbs.de Q: What's a light-year? A: One-third less calories than a regular year. --q32cnevfijilozuy Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-testing-lisp-test-org-archive.el-Fix-test.patch" >From 94055073ce79080be360070b86dcd5f2c074c9d3 Mon Sep 17 00:00:00 2001 From: Christian Garbs Date: Wed, 13 Jan 2021 22:57:21 +0100 Subject: [PATCH] testing/lisp/test-org-archive.el: Fix test * testing/lisp/test-org-archive.el (test-org-archive/datetree): Fix test for locales that don't use English weekday names. --- testing/lisp/test-org-archive.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/lisp/test-org-archive.el b/testing/lisp/test-org-archive.el index 71ab427d2..d24a54794 100644 --- a/testing/lisp/test-org-archive.el +++ b/testing/lisp/test-org-archive.el @@ -63,7 +63,7 @@ ;; Test in buffer target with no additional subheadings... (should (string-match-p - (regexp-quote "*** 2020-07-05 Sunday\n**** a") + (regexp-quote (format-time-string "*** 2020-07-05 %A\n**** a")) (org-test-with-temp-text-in-file "* a\n" (let ((org-archive-location "::datetree/")) (org-archive-subtree) @@ -71,7 +71,7 @@ ;; ... and with `org-odd-levels-only' non-nil. (should (string-match-p - (regexp-quote "***** 2020-07-05 Sunday\n******* a") + (regexp-quote (format-time-string "***** 2020-07-05 %A\n******* a")) (org-test-with-temp-text-in-file "* a\n" (let ((org-archive-location "::datetree/") (org-odd-levels-only t)) @@ -80,7 +80,7 @@ ;; Test in buffer target with an additional subheading... (should (string-match-p - (regexp-quote "*** 2020-07-05 Sunday\n**** a\n***** b") + (regexp-quote (format-time-string "*** 2020-07-05 %A\n**** a\n***** b")) (org-test-with-temp-text-in-file "* b\n" (let ((org-archive-location "::datetree/* a")) (org-archive-subtree) @@ -88,7 +88,7 @@ ;; ... and with `org-odd-levels-only' non-nil. (should (string-match-p - (regexp-quote "***** 2020-07-05 Sunday\n******* a\n********* b") + (regexp-quote (format-time-string "***** 2020-07-05 %A\n******* a\n********* b")) (org-test-with-temp-text-in-file "* b\n" (let ((org-archive-location "::datetree/* a") (org-odd-levels-only t)) -- 2.20.1 --q32cnevfijilozuy--