Merge ~mitchburton/ubuntu/+source/landscape-client:2084586-add-python3-yaml-dep-plucky into ubuntu/+source/landscape-client:ubuntu/plucky-devel

[Mitch Burton]

[Mitch Burton (mitchburton)]

I can split this into two merge requests if that' better - one for the unit test fixes and one for the python3-yaml dep addition.

[Mitch Burton (mitchburton)]

See https://launchpad.net/~mitchburton/+archive/ubuntu/landscape-client-uploads/+packages for an upload of this version of landscape-client.

[Lukas Märdian (slyon)]

LGTM. I can confirm this matches the changes merged upstream, except for some minimal changes in the comments (and existing context), i.e.:

1/ landscape/client/broker/tests/test_transport.py (context):
   message_api=b"X.Y" vs message_api="X.Y"

2/ landscape/lib/testing.py
   # Required for failures to get GC'd and properly flushed.
   # Twisted did this for us in versions < 24.10.
   VS
   # Required for some failures to get GC'd properly flushed.
   # Twisted did this in versions < 24.10, but now we have to.

LGTM. Sponsoring into Plucky.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9fdb054..82fa383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (24.08-0ubuntu3) plucky; urgency=medium
+
+  * d/control: add python3-yaml dependency to landscape-client (LP: #2084586)
+  * d/p/fix-plucky-tests.patch: fix unit tests on Twisted >= 24.10
+
+ -- Mitch Burton <[e-mail]>  Fri, 29 Nov 2024 14:18:44 -0800
+
 landscape-client (24.08-0ubuntu2) oracular; urgency=medium
 
   * d/t/control: add unit tests
diff --git a/debian/control b/debian/control
index 3a859a6..de262c9 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Depends: ${python3:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
          landscape-common (= ${binary:Version}),
          python3-pycurl,
-	 python3-dbus
+	 python3-dbus,
+	 python3-yaml
 Description: Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
diff --git a/debian/patches/fix-plucky-tests.patch b/debian/patches/fix-plucky-tests.patch
new file mode 100644
index 0000000..8d3cc72
--- /dev/null
+++ b/debian/patches/fix-plucky-tests.patch
@@ -0,0 +1,46 @@
+Description: Fix unit tests on Twisted >= 24.10
+Author: Mitch Burton <[e-mail]>
+Origin: https://github.com/canonical/landscape-client/pull/290
+Last-Update: 2024-11-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/landscape/lib/testing.py
++++ b/landscape/lib/testing.py
+@@ -685,7 +685,15 @@
+             # because the call might cancel it!
+             call._data = self.call_later(seconds, fake)._data
+             try:
+-                f(*args, **kwargs)
++                deferred = f(*args, **kwargs)
++
++                if (
++                    hasattr(deferred, "result")
++                    and isinstance(deferred.result, Failure)
++                ):
++                    # Required for some failures to get GC'd properly flushed.
++                    # Twisted did this in versions < 24.10, but now we have to.
++                    deferred.result.cleanFailure()
+             except Exception:
+                 if call.active:
+                     self.cancel_call(call)
+--- a/landscape/client/broker/tests/test_transport.py
++++ b/landscape/client/broker/tests/test_transport.py
+@@ -193,16 +193,10 @@
+             message_api="X.Y",
+         )
+ 
+-        def got_result(ignored):
++        def got_result(failure):
+             self.assertIs(r.request, None)
+             self.assertIs(r.content, None)
+-            logfile_value = self.logfile.getvalue()
+-            # pycurl error messages vary by version.
+-            # First is for <= noble, second for > noble.
+-            self.assertTrue(
+-                "server certificate verification failed" in logfile_value
+-                or "SSL certificate problem" in logfile_value,
+-            )
++            self.assertEqual(failure.value.error_code, 60)
+ 
+         result.addErrback(got_result)
+         return result
diff --git a/debian/patches/series b/debian/patches/series
index 051c373..0b133d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-landscape-client-manpage.patch
+fix-plucky-tests.patch