[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1069326: marked as done (dh-elpa: Don't rename files under test directories during autopkgtest by default)

Your message dated Wed, 24 Jul 2024 02:24:21 +0000
with message-id <E1sWRfx-007V2k-TI@fasolo.debian.org>
and subject line Bug#1069326: fixed in dh-elpa 2.1.3
has caused the Debian Bug report #1069326,
regarding dh-elpa: Don't rename files under test directories during autopkgtest by default
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1069326: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069326
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: dh-elpa
Version: 2.0.17
Severity: normal
X-Debbugs-Cc: none, Xiyue Deng <manphiz@gmail.com>

During autopkgtest, dh_elpa_test will rename the non-test source files
so as to ensure we are running the test using the Emacs add-on modules
from the installed package instead of from the source directories.  The
way that dh_elpa_test currently works is to only keep files that have a
test case defined in it.  However, this doesn't take utilities and
artifacts, which are usually defined under test directories, under
consideration, and without those the tests are broken as well.

Therefore I'd like to propose retaining all files under test directories
from being renamed in autopkgtest.  I have been testing a fix in [1]
which seems to work in common cases.  I have also attached the patches
at the end of the email as well.  Please review and comment.  TIA!

[1] https://salsa.debian.org/manphiz/dh-elpa/-/compare/master...retain-test-files-in-autopkgtest?from_project_id=18920

-- System Information:
Debian Release: 12.5
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.1.0-20-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dh-elpa depends on:
ii  debhelper               13.11.4
ii  emacs                   1:29.3+1-2~bpo12+0manphiz1
ii  emacs-gtk [emacs]       1:29.3+1-2~bpo12+0manphiz1
ii  libarray-utils-perl     0.5-3
ii  libconfig-tiny-perl     2.28-2
ii  libdebian-source-perl   0.122
ii  libdpkg-perl            1.21.22
ii  libfile-find-rule-perl  0.34-3
ii  libtext-glob-perl       0.11-3
ii  perl                    5.36.0-7+deb12u1

dh-elpa recommends no packages.

dh-elpa suggests no packages.

-- no debconf information

>From 48514b41927f8601c6e1af7ebcf49c4af9a16b54 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Fri, 19 Apr 2024 14:14:31 -0700
Subject: [PATCH 1/2] Exclude test directories from renaming in autopkgtest by
 default

* Files under test directories may also include utilities that are
used in tests but don't have any test in them.  It makes sense to keep
them by default during autopkgtest to make it work out-of-the-box.
---
 dh_elpa_test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dh_elpa_test b/dh_elpa_test
index 14e31dd..b9f1152 100755
--- a/dh_elpa_test
+++ b/dh_elpa_test
@@ -271,7 +271,9 @@ if ($autopkgtest) {
     my $rule = File::Find::Rule->new;
     $rule
       ->or(File::Find::Rule
-           ->name('.pc', 'debian', '.git')
+           ->name('.pc', 'debian', '.git', # exclude non-source directories
+                  'test', 'tests', # exclude test directories
+           )
            ->directory->prune->discard,
            File::Find::Rule->new);
     $rule
-- 
2.39.2


>From eb4f407d6c1541fda298dcfe8bcaee1fdebd5677 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Fri, 19 Apr 2024 14:24:40 -0700
Subject: [PATCH 2/2] Add more comments to describe the purpose of renaming
 source files

---
 dh_elpa_test | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dh_elpa_test b/dh_elpa_test
index b9f1152..c0e99e0 100755
--- a/dh_elpa_test
+++ b/dh_elpa_test
@@ -268,6 +268,10 @@ if ($autopkgtest) {
         exit 0;
     }
 
+    # Compile a list of files to be renamed during autopkgtest.  This usually
+    # renames source *.el file outside the test directories so that during
+    # autopkgtest we are testing the installed package instead of relying on
+    # source files from the source directory.
     my $rule = File::Find::Rule->new;
     $rule
       ->or(File::Find::Rule
-- 
2.39.2

--- End Message ---
--- Begin Message --- 
Source: dh-elpa
Source-Version: 2.1.3
Done: Sean Whitton <spwhitton@spwhitton.name>

We believe that the bug you reported is fixed in the latest version of
dh-elpa, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1069326@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sean Whitton <spwhitton@spwhitton.name> (supplier of updated dh-elpa package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Wed, 24 Jul 2024 11:20:49 +0900
Source: dh-elpa
Architecture: source
Version: 2.1.3
Distribution: unstable
Urgency: medium
Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
Changed-By: Sean Whitton <spwhitton@spwhitton.name>
Closes: 973393 1069210 1069326
Changes:
 dh-elpa (2.1.3) unstable; urgency=low
 .
   * Upload to unstable.
   * Fix some copyright years.
   * Make autoscripts/prerm-elpa executable.
 .
 dh-elpa (2.1.2) experimental; urgency=medium
 .
   [ Xiyue Deng ]
   * Set ert-batch-backtrace-right-margin to nil to allow full backtrace
     when ERT tests fail (Closes: #973393).
   * Add support for passing ERT selectors using ert_selectors.
   * Handle git version with date in dhelpa-sanitise-version.
   * dh_elpa_test: Don't rename files under test/, tests/
     (Closes: #1069326).
   * Use `pretty' stack frame style in buttercup for full back trace.
   * Add support for installing nested directories (Closes: #1069210)
     - Don't recursively add to elpa path, to match package.el
     - Byte-compile recursively during install
     - Recursively create the symlinks from elpa-src->elpa.
 .
   [ Aymeric Agon-Rambosson ]
   * Get Package-Requires with lm-header-multiline (some upstream
     maintainers specify one dependency per line).
   * Add transient to the list of packages packaged separately as well as
     provided with Emacs.
 .
 dh-elpa (2.1.1) experimental; urgency=medium
 .
   * Remove /usr/share/$flavor/site-lisp/elpa (from emacsen-remove)
     if it is empty
 .
 dh-elpa (2.1.0) experimental; urgency=medium
 .
   * Call emacsen-remove script directly from generated prerm. For now this
     requires a custom debhelper autoscript template, that this package
     installs.
   * Eliminate dependency on dh-elpa-helper for emacsen-remove. This will
     require a rebuild to fix emacsen-remove scripts, but seems mandated by
     policy.
   * Add a version to debhelper generated snippets.
   * Make install helper shellcheck clean
Checksums-Sha1:
 7ad38b9e8a6c423c2965c5c6e553bfbe9b6302f8 1914 dh-elpa_2.1.3.dsc
 67470842fc526897f7d0403770200e9274cfec37 27540 dh-elpa_2.1.3.tar.xz
Checksums-Sha256:
 12f2b82c55a81ed84a8702eec9d83070fac364c3d2a8ea032215b515c18cbf20 1914 dh-elpa_2.1.3.dsc
 1a5e8a43f44374f641a76aeec9107bc37ba746d59c5c46950febc276e3f83656 27540 dh-elpa_2.1.3.tar.xz
Files:
 4c3040a0d40ef66c8d77c88213861cb6 1914 devel optional dh-elpa_2.1.3.dsc
 f8685b4e2f2c7f61019b79957b72093c 27540 devel optional dh-elpa_2.1.3.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAmagZSYACgkQaVt65L8G
YkAsaA/7BVW/PyPfF/hIbaPvJlaGWdyVXav2d3WiBiiFnoD3AmoTnau7oZtrNMEg
4+1U7TNJxo3OIJiKc5CM5foHgG+0Dg2nRjf8adlpUQBeUFiNZnjXa3Ce7pfKmhYc
Rp/KKZL9sl6cr9tu1rbKai7UHlX0dMhKQZ3QuI5zOVtwbwFtUh3UKwigXDSfnIHJ
zX+JTDgrU+7Yv/NAsu/PwaxlRLDqVqZM2zA0QOmTNLm9eKwgKI1PHi1lfiKfu+q3
GVGwobWIYsak+uhIY2BUf55Not5R2jcYpLtbCbHN5G5lxE7dC0XyQDwnVFGcL+u0
fPl2e+B5loSK78i9PXl0GnqKydBskHgSwRR4FytCvboBw0tER8BXNLEHWTV20RJP
0mrx0XRayyvjD07IOAsTNZPirMcKLwDx0f+K2jHWBpn7Q3Cp9sJL8pVpUjZ1ZzI3
J96bncdFpMhr12c/cW7V3Ealhip/sFwSQ8Im+cyu6zxK6TuAL1OKPT2JDUFSrjeO
MFDKbvpQEJcmduIZIhwh/DvRNYVMWgvBjgi+T7Zut9QNl9uBXM72rXPKIGL8slYm
2PmWKO5m+g1itjNsNHmVYePY8EUli0UitPNhjuOnOsop24TS+HUjdD3unI6gFe+F
1umiiSAhIs54PnaiXJQb3mW1W0qujzoJEZ2JVUnrIsneeWALn2I=
=gqrw
-----END PGP SIGNATURE-----

Attachment: pgpiFGSvKvznm.pgp
Description: PGP signature


--- End Message ---
Reply to: