Merge ~danilogondolfo/ubuntu/+source/diffoscope:merge_mantic_1 into ubuntu/+source/diffoscope:debian/sid

[Danilo Egea Gondolfo]

5004342... by Danilo Egea Gondolfo on 2023-07-05

Mark new test_arsc.py::test_differences xfail on
armhf, it passes locally but fails on the infrastructure,
pending further investigation

337450e... by Danilo Egea Gondolfo on 2023-07-05

Update maintainer

bf6c618... by Danilo Egea Gondolfo on 2023-07-05

Changelog

[Athos Ribeiro (athos-ribeiro)]

Hi Danilo,

Did you follow the process described in https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md?

If so, would you mind also pushing the tags generated through that merge process?

[Christian Ehrhardt  (paelzer)]

While this misses the old delta as well, it is trivial enough (not like sudo) to have a look.

You link to LP: #2026151 which tracks the test failures in Ubuntu Infra - thanks!
Thanks for also retrying "The patch is still present because it's still failing on armhf."

* Changelog:
  - [+] changelog entry correct version and targeted codename
  - [+] changelog entries correct
  - [+] bug references correct
  - [+] update-maintainer has been run

* Merge - Indirect Changes:
  - [+] no upstream (=debian in this case) changes that need adaptation
  - [+] no further upstream version to consider
  - [+] debian changes look safe

* Merge - Old Delta:
  - [n/a] dropped changes are ok to be dropped
  - [+] nothing else to drop

* New Delta:
  - [+] no new patches added

* Git/Maintenance
  - [n/a] testcases added or not needed for this
  - [+] commits are properly split (more important on -dev than on SRUs)

* Build/Test (on the PPA I found from your bug):
  - [+] build is ok
  - [+] verified PPA package installs/uninstalls
  - [+] autopkgtest is fine (based on you testing the fix, I haven't seen it)
  - [+] sanity checks test fine

review: Approve

[Christian Ehrhardt  (paelzer)]

Sponsored with VCS tags, so next time out of git-ubuntu it will come with split git history \o/

$ dput ubuntu diffoscope_243ubuntu1_source.changes
Uploading diffoscope using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running checksum: verify checksums before uploading
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running placeholderbug: Stop if using common placeholder numbers as bug reference.
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running check-debs: makes sure the upload contains a binary package
running required-fields: check whether a field is present and non-empty in the changes file
running gpg: check GnuPG signatures before the upload
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running nobug: Stop if uploading without any bug reference.
running suite-mismatch: check the target distribution for common errors
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
Uploading diffoscope_243ubuntu1.dsc
Uploading diffoscope_243ubuntu1.tar.xz
Uploading diffoscope_243ubuntu1_source.buildinfo
Uploading diffoscope_243ubuntu1_source.changes

[Danilo Egea Gondolfo (danilogondolfo)]

Thank you, Christian.

I'm not sure what happened, but the build is failing because some binary files used by some tests are missing.

See https://git.launchpad.net/ubuntu/+source/diffoscope/commit/?id=5cdc4d6a9ceea850be325ddf933b6bd5226108cf

The diff between ubuntu/devel and debian/sid now contains this:

diff --git a/tests/data/elfmix2.a b/tests/data/elfmix2.a
deleted file mode 100644
index c0269b7..0000000
Binary files a/tests/data/elfmix2.a and /dev/null differ
diff --git a/tests/data/test1.a b/tests/data/test1.a
deleted file mode 100644
index 501ca17..0000000
Binary files a/tests/data/test1.a and /dev/null differ
diff --git a/tests/data/test1.o b/tests/data/test1.o
deleted file mode 100644
index a94647d..0000000
Binary files a/tests/data/test1.o and /dev/null differ
diff --git a/tests/data/test2.a b/tests/data/test2.a
deleted file mode 100644
index 4d6f65a..0000000
Binary files a/tests/data/test2.a and /dev/null differ
diff --git a/tests/data/test2.o b/tests/data/test2.o
deleted file mode 100644
index 1e0bb82..0000000
Binary files a/tests/data/test2.o and /dev/null differ

They are not present in the tarball you uploaded. Those deletions are not part of my MP.

[Christian Ehrhardt  (paelzer)]

That is indeed odd, maybe a weird interaction due to being a native package plus delta.
I'll have a look ...

Yep I see the delta you mentioned.
But the directory I had when building that did not :-/?

Double checked the .dsc and .changes of the upload and they indeed had that unintended change.
While I can't yet think of how that was caused I know how to fix this up.

It also didn't map the import to the pushed VCS tags. So my theory really is going towards some unexpected interaction. Sorry @Danilo for this extra step, I'll upload a fixed version.

[Christian Ehrhardt  (paelzer)]

Yep, I can at least reproduce this issue.

What I uploaded was correct on disk and in git:

https://git.launchpad.net/~paelzer/ubuntu/+source/diffoscope/diff/?h=danilogondolfo_merge_mantic_1&id=bf6c6188d944806b516aabe65bf328d906768336&id2=202ad0b6515ef427291d5747406809c3fc11cc91

I recreated a branch meant to amend this issue.
https://git.launchpad.net/~paelzer/ubuntu/+source/diffoscope/diff/?h=fix-lost-test-files-mantic&id=0dd920ae38eb33c141858e0cd1d5ecaa0266ce1a&id2=202ad0b6515ef427291d5747406809c3fc11cc91

But as expected, other than the changelog diff that is the same.
Yet on buildpackage from that tree and checking debdiff I see:
...
Binary files /tmp/JqU_4VSXKy/diffoscope-243/tests/data/elfmix2.a and /tmp/tbGODW93AS/diffoscope-243ubuntu2/tests/data/elfmix2.a differ
Binary files /tmp/JqU_4VSXKy/diffoscope-243/tests/data/test1.a and /tmp/tbGODW93AS/diffoscope-243ubuntu2/tests/data/test1.a differ
Binary files /tmp/JqU_4VSXKy/diffoscope-243/tests/data/test1.o and /tmp/tbGODW93AS/diffoscope-243ubuntu2/tests/data/test1.o differ
Binary files /tmp/JqU_4VSXKy/diffoscope-243/tests/data/test2.a and /tmp/tbGODW93AS/diffoscope-243ubuntu2/tests/data/test2.a differ
Binary files /tmp/JqU_4VSXKy/diffoscope-243/tests/data/test2.o and /tmp/tbGODW93AS/diffoscope-243ubuntu2/tests/data/test2.o differ

I feel that this is either
a) something super weird proud to eventually have understood
b) something super embarrassing that I've forgotten about native packages and overlook now just waiting on my to facepalm hard

Well either way, it is not in there:
$ cd $(mktemp -d); pull-debian-source diffoscope &>/dev/null; tar tf diffoscope_243.tar.xz | grep elfmix2.a
diffoscope-243/tests/data/elfmix2.a
$ cd $(mktemp -d); pull-lp-source diffoscope &>/dev/null; tar tf diffoscope_243ubuntu1.tar.xz | grep elfmix2.a

This made me realize that it is very selective, look at this:
$ rm ../diffoscope_243ubuntu2.tar.xz; ll tests/data/elfmix*; dpkg-buildpackage -S -nc -I -i -d -sa -v240ubuntu1 $(git ubuntu prepare-upload args); tar tf ../diffoscope_243ubuntu2.tar.xz | grep elfmix
-rw-rw-r-- 1 paelzer paelzer 5280 Jul 10 14:38 tests/data/elfmix1.not_a
-rw-rw-r-- 1 paelzer paelzer 5280 Jul 11 07:22 tests/data/elfmix2.a
-rw-rw-r-- 1 paelzer paelzer 199 Jul 10 14:38 tests/data/elfmix_disassembly_expected_diff
-rw-rw-r-- 1 paelzer paelzer 154 Jul 10 14:38 tests/data/elfmix_mach_o_expected_diff__text
-rw-rw-r-- 1 paelzer paelzer 95 Jul 10 14:38 tests/data/elfmix_src_c_expected_diff
-rw-rw-r-- 1 paelzer paelzer 170 Jul 10 14:38 tests/data/elfmix_x_obj_expected_diff
-rw-rw-r-- 1 paelzer paelzer 167 Jul 10 14:38 tests/data/elfmix_x_obj_objdump_expected_diff
...
diffoscope/tests/data/elfmix1.not_a
diffoscope/tests/data/elfmix_disassembly_expected_diff
diffoscope/tests/data/elfmix_mach_o_expected_diff__text
diffoscope/tests/data/elfmix_src_c_expected_diff
diffoscope/tests/data/elfmix_x_obj_expected_diff
diffoscope/tests/data/elfmix_x_obj_objdump_expected_diff

And that made me realize that all the files that are missing are .a and .o files.
That looks like a build cleanup stage removing them by accident.

So let me check the set of usual arguments, best candidates are those in rega...

Unmerged commits

bf6c618... by Danilo Egea Gondolfo on 2023-07-05

Changelog

337450e... by Danilo Egea Gondolfo on 2023-07-05

Update maintainer

5004342... by Danilo Egea Gondolfo on 2023-07-05

Mark new test_arsc.py::test_differences xfail on
armhf, it passes locally but fails on the infrastructure,
pending further investigation

diff --git a/debian/changelog b/debian/changelog
index 27f4f47..1f2b0b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+diffoscope (243ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2025887). Remaining changes:
+    - Mark new test_arsc.py::test_differences xfail on
+      armhf, it passes locally but fails on the infrastructure,
+      pending further investigation. See LP: #2026151
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Tue, 04 Jul 2023 18:56:40 +0100
+
 diffoscope (243) unstable; urgency=medium
 
   [ Chris Lamb ]
@@ -32,6 +41,14 @@ diffoscope (241) unstable; urgency=medium
 
  -- Chris Lamb <[e-mail]>  Fri, 21 Apr 2023 09:26:15 +0100
 
+diffoscope (240ubuntu1) lunar; urgency=medium
+
+  * Mark new test_arsc.py::test_differences xfail on
+    armhf, it passes locally but fails on the infrastructure,
+    pending further investigation
+
+ -- Graham Inggs <[e-mail]>  Wed, 12 Apr 2023 06:27:18 +0000
+
 diffoscope (240) unstable; urgency=medium
 
   [ Holger Levsen ]
diff --git a/debian/control b/debian/control
index bdf15ad..8ee4caa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: diffoscope
 Section: devel
 Priority: optional
-Maintainer: Reproducible builds folks <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Reproducible builds folks <[e-mail]>
 Uploaders:
  Chris Lamb <[e-mail]>,
  Holger Levsen <[e-mail]>,
diff --git a/tests/comparators/test_arsc.py b/tests/comparators/test_arsc.py
index f7c3cc2..10d88f7 100644
--- a/tests/comparators/test_arsc.py
+++ b/tests/comparators/test_arsc.py
@@ -17,6 +17,7 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import pytest
+import platform
 
 from diffoscope.config import Config
 from diffoscope.comparators.arsc import ArscFile
@@ -50,6 +51,9 @@ def check_arsc_differences(differences, expected_diff):
     assert expected_diff == differences[0].unified_diff
 
 
[e-mail](
+    "arm" in platform.machine(), reason="fails on armhf infrastructure"
+)
 @skip_unless_tools_exist("aapt2")
 def test_differences(differences):
     expected_diff = get_data("arsc_expected_diff")