Merge ~hyask/ubuntu/+source/beets:skia/fix_s390x_autopkgtest_ubuntu into ubuntu/+source/beets:ubuntu/devel

[Skia]

This is a bugfix only patch, to allow the package to migrate from -proposed. This isn't seeded anywhere, so shouldn't be of much trouble regarding the upcoming Plucky release.

[Andreas Hasenack (ahasenack)]

I don't understand yet what is going on.

This is a noarch build, so all builds happen on amd64. The failure is in the build tests, which are also run again as dep8 tests.

I'm first checking the current version in the archive, without this patch.

In a plucky PPA, the amd64 build skips the problematic test, because:

  SKIPPED [1] test/plugins/test_thumbnails.py:263: GIO library not found

If I build it locally in an amd64 lxd, though, the test isn't skipped, and passes.

If I build it in an s390x lxd, the test is not skipped, but fails.

So first I'm trying to understand why the ppa build is different, and what makes GIO not be found there.

[Skia (hyask)]

There, as requested, I've opened bug 2106276 to document the case, and updated the changelog accordingly.

I didn't try to build directly in an s390x container, so didn't encounter that weird mismatch during the build. The only thing I see is that the test is skipped during the build on amd64, indeed because GIO isn't there, but the test is never skipped during dep8 run, and now always passes on all architectures (with the fix).

autopkgtest results on all arches: https://autopkgtest.ubuntu.com/user/hyask/ppa/beets

[Paride Legovini (paride)]

@Andreas probably the LXD container you built in is not as minimal as a PPA chroot? I tried starting a fresh lxd container locally and it has libglib2.0-0t64 preinstalled (which is the library providing gio). Even containers built using minimal images have that library installed.

Look like LP or git-ubuntu are broken right now (I can't `git ubuntu clone`), so I can't review/test locally, but this LGTM.

[Andreas Hasenack (ahasenack)]

I purged libglib2.0-0t64 from the s390x container, and built beets again. It runs the unit tests during build, and then I can see the skipped test:

test/plugins/test_thumbnails.py .......s. [ 557/1797]
...
SKIPPED [1] test/plugins/test_thumbnails.py:263: GIO library not found

[Andreas Hasenack (ahasenack)]

I'm now getting this build/test error on s390x (I did reinstall libglib2.0-0t64):

FAILED test/plugins/test_permissions.py::PermissionsPluginTest::test_failing_to_set_permissions
= 1 failed, 1691 passed, 97 skipped, 1 deselected, 9 xfailed, 1 warning in 39.64s =
E: pybuild pybuild:389: test: plugin pyproject failed with: exit code=1: cd /home/ubuntu/git/packages/beets/beets/.pybuild/cpython3_3.13/build; python3.13 -m pytest -k "not test_completion"
dh_auto_test: error: pybuild --test --test-pytest -i python{version} -p 3.13 returned exit code 13

In more detail:
____________ PermissionsPluginTest.test_failing_to_set_permissions _____________

self = <test.plugins.test_permissions.PermissionsPluginTest testMethod=test_failing_to_set_permissions>

    @patch("os.chmod", Mock())
    def test_failing_to_set_permissions(self):
> self.do_thing(False)

test/plugins/test_permissions.py:34:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
test/plugins/test_permissions.py:60: in do_thing
    self.assertPerms(item.path, "file", expect_success)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
                                                                                                                                     ...

[Skia (hyask)]

Thanks for getting back to this. When you mention "always a PPA build to try", you mean a PPA with only s390x enabled to get a build on s390x specifically? Otherwise I already pushed that to a PPA and triggered autopkgtest for all architectures:
* PPA: https://launchpad.net/~hyask/+archive/ubuntu/beets
* autopkgtest: https://autopkgtest.ubuntu.com/user/hyask/ppa/beets

[Andreas Hasenack (ahasenack)]

> you mean a PPA with only s390x enabled to get a build on s390x specifically?

Yeah, as I got that other test error in a lxd. But it built fine in the ppa.

Upstream approved it, and I have no other objections/comments. +1

review: Approve

[Andreas Hasenack (ahasenack)]

Let me know if you need sponsoring.

[Skia (hyask)]

Thanks for the review, and yes, I do need sponsoring. :-)

[Andreas Hasenack (ahasenack)]

Uploaded:

Uploading beets_2.2.0-2ubuntu1.dsc
Uploading beets_2.2.0-2ubuntu1.debian.tar.xz
Uploading beets_2.2.0-2ubuntu1_source.buildinfo
Uploading beets_2.2.0-2ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 0cddbc8..9e3acd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beets (2.2.0-2ubuntu1) plucky; urgency=medium
+
+  * Patch: plugins/thumbnails: fix FFI with GIO on s390x.
+    LP: #2106276
+
+ -- Florent 'Skia' Jacquet <[e-mail]>  Fri, 04 Apr 2025 17:50:13 +0200
+
 beets (2.2.0-2) unstable; urgency=medium
 
   * Patch: Don't use 2025 as a "future" year. (Closes: #1091495)
diff --git a/debian/control b/debian/control
index f64a5b2..640bae0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: beets
 Section: sound
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Stefano Rivera <[e-mail]>,
  Ryan Kavanagh <[e-mail]>
diff --git a/debian/patches/fix-ubuntu-s390x b/debian/patches/fix-ubuntu-s390x
new file mode 100644
index 0000000..f0ae961
--- /dev/null
+++ b/debian/patches/fix-ubuntu-s390x
@@ -0,0 +1,76 @@
+From: Florent 'Skia' Jacquet <[e-mail]>
+Date: Fri, 4 Apr 2025 17:16:16 +0200
+Subject: plugins/thumbnails: fix FFI with GIO on s390x
+
+Using the correct function signature for g_file_new_for_path fixes the
+tests on s390x.
+I do not have the full story on why this failed consistently only on
+s390x, but I guess the big endian might have something to play with
+this.
+
+Here is how the tests were failing:
+```
+169s ___________________________ ThumbnailsTest.test_uri ____________________________
+169s
+169s self = <test.plugins.test_thumbnails.ThumbnailsTest testMethod=test_uri>
+169s
+169s     def test_uri(self):
+169s         gio = GioURI()
+169s         if not gio.available:
+169s             self.skipTest("GIO library not found")
+169s
+169s >       assert gio.uri("/foo") == "file:///"  # silent fail
+169s E       AssertionError: assert '' == 'file:///'
+169s E
+169s E         - file:///
+169s
+169s test/plugins/test_thumbnails.py:268: AssertionError
+```
+You can see a full log here [1] and a history of consistent failure
+here [2]. Both links are bound to expire at some point, sorry future
+archeologist 🤷.
+
+[1]: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky/plucky/s390x/b/beets/20250403_162414_5d1da@/log.gz#S5
+[2]: https://autopkgtest.ubuntu.com/packages/beets/plucky/s390x
+
+
+Bug: LP: #2106276
+Forwarded: https://github.com/beetbox/beets/pull/5708
+Forwarded: https://salsa.debian.org/python-team/packages/beets/-/merge_requests/3
+---
+ beetsplug/thumbnails.py         | 2 +-
+ test/plugins/test_thumbnails.py | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/beetsplug/thumbnails.py b/beetsplug/thumbnails.py
+index 3f88248e00d1..44ffd12defa1 100644
+--- a/beetsplug/thumbnails.py
++++ b/beetsplug/thumbnails.py
+@@ -246,7 +246,7 @@ class GioURI(URIGetter):
+         if self.available:
+             self.libgio.g_type_init()  # for glib < 2.36
+ 
+-            self.libgio.g_file_get_uri.argtypes = [ctypes.c_char_p]
++            self.libgio.g_file_new_for_path.argtypes = [ctypes.c_char_p]
+             self.libgio.g_file_new_for_path.restype = ctypes.c_void_p
+ 
+             self.libgio.g_file_get_uri.argtypes = [ctypes.c_void_p]
+diff --git a/test/plugins/test_thumbnails.py b/test/plugins/test_thumbnails.py
+index 3eb36cd25732..00cd545d47f5 100644
+--- a/test/plugins/test_thumbnails.py
++++ b/test/plugins/test_thumbnails.py
+@@ -265,7 +265,10 @@ class ThumbnailsTest(BeetsTestCase):
+         if not gio.available:
+             self.skipTest("GIO library not found")
+ 
+-        assert gio.uri("/foo") == "file:///"  # silent fail
++        import ctypes
++
++        with pytest.raises(ctypes.ArgumentError):
++            gio.uri("/foo")
+         assert gio.uri(b"/foo") == "file:///foo"
+         assert gio.uri(b"/foo!") == "file:///foo!"
+         assert (
+-- 
+2.48.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 4e11c42..10041dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ skip-broken-test
 skip-unreliable-tests
 test-rsrc
 2025-future
+fix-ubuntu-s390x