Merge ~cjwatson/launchpadlib:fakelaunchpad-plain-methods into launchpadlib:main

[Colin Watson]

Fix handling of methods with no response representation

Some methods have no response representation defined in their WADL; these return plain data rather than an entry or a collection. Don't attempt to wrap the result of such fake methods in a `FakeResource`.

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/NEWS.rst b/NEWS.rst
index 29fc779..09feeb8 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,8 @@ NEWS for launchpadlib
   ``launchpadlib.testing.launchpad.FakeLaunchpad``.
 - Allow setting ``FakeLaunchpad`` sample data with attributes that are links
   to other entries or collections.
+- Fix handling of methods with no response representation in
+  ``FakeLaunchpad``.
 
 1.10.18 (2022-10-28)
 ====================
diff --git a/src/launchpadlib/testing/launchpad.py b/src/launchpadlib/testing/launchpad.py
index 3b68798..aa2ee6d 100644
--- a/src/launchpadlib/testing/launchpad.py
+++ b/src/launchpadlib/testing/launchpad.py
@@ -493,12 +493,15 @@ class FakeResource(object):
         @param result: The result of calling the method.
         @raises IntegrityError: Raised if C{result} is an invalid return value
             for the method.
-        @return: A L{FakeResource} for C{result}.
+        @return: A L{FakeResource} for C{result}, or just C{result} if no
+            response representation is defined for the method.
         """
         resource_name = resource_type.tag.get("id")
         if resource_name == name:
             name = "get"
         xml_id = self._find_representation_id(resource_type, name)
+        if xml_id is None:
+            return result
         xml_id = strip_suffix(xml_id, "-full")
         if xml_id not in self._application.resource_types:
             xml_id += "-resource"
diff --git a/src/launchpadlib/testing/testing-wadl.xml b/src/launchpadlib/testing/testing-wadl.xml
index 650711d..720ac51 100644
--- a/src/launchpadlib/testing/testing-wadl.xml
+++ b/src/launchpadlib/testing/testing-wadl.xml
@@ -161,6 +161,12 @@
     </wadl:method>
 
     <wadl:method name="DELETE" id="branch-delete"/>
+
+    <wadl:method id="branch-canBeDeleted" name="GET">
+      <wadl:request>
+        <wadl:param style="query" name="ws.op" required="true" fixed="canBeDeleted"/>
+      </wadl:request>
+    </wadl:method>
   </wadl:resource_type>
 
   <wadl:representation mediaType="application/json"
diff --git a/src/launchpadlib/testing/tests/test_launchpad.py b/src/launchpadlib/testing/tests/test_launchpad.py
index cad2f10..c988d2b 100644
--- a/src/launchpadlib/testing/tests/test_launchpad.py
+++ b/src/launchpadlib/testing/tests/test_launchpad.py
@@ -261,6 +261,17 @@ class FakeLaunchpadTest(ResourcedTestCase):
         self.launchpad.branches = dict(getByUniqueName=lambda name: None)
         self.assertIsNone(self.launchpad.branches.getByUniqueName("foo"))
 
+    def test_callable_object_no_response_representation(self):
+        """
+        If the WADL definition of a method does not include a response
+        representation, then fake versions of that method just pass through
+        the return value.
+        """
+        branch = dict(canBeDeleted=lambda: True)
+        self.launchpad.branches = dict(getByUniqueName=lambda name: branch)
+        branch = self.launchpad.branches.getByUniqueName("foo")
+        self.assertTrue(branch.canBeDeleted())
+
     def test_entry_property(self):
         """
         Attributes that represent links to other objects are set using a