Merge ~cjwatson/launchpad:fix-stormify-message into launchpad:master

[Colin Watson]

Fix bugs-emailinterface.rst after conversion of Message to Storm

The `DecoratedResultSet` used in `Bug.messages` to replace the previous `SQLRelatedJoin(prejoins=["owner"])` can't support `__contains__` without a fair bit of work. Fortunately this wasn't needed very much. There was one use in `Bug.linkMessage` which I already replaced with an explicit Storm query, but I missed the uses of it in `bugs-emailinterface.rst`.

In a test we don't need to care much about performance, so I just used `set(bug.messages)` to materialize the result of the query and turn it into something that supports `__contains__`.

[Ines Almeida (ines-almeida)]

review: Approve

[Jürgen Gmach (jugmac00)]

Would it make sense to add a comment in the tests?

It is currently not obvious when reading the tests why `set` was used. And we will probably trip over it once we convert the doctests to unit tests.

[Colin Watson (cjwatson)]

Well, I think you'd rather quickly find out that it's needed and put it back ... but sure, I've added a quick comment.

diff --git a/lib/lp/bugs/tests/bugs-emailinterface.rst b/lib/lp/bugs/tests/bugs-emailinterface.rst
index 6ae9275..1a8a900 100644
--- a/lib/lp/bugs/tests/bugs-emailinterface.rst
+++ b/lib/lp/bugs/tests/bugs-emailinterface.rst
@@ -297,7 +297,11 @@ includes commands, the email has to be OpenPGP-signed.
     >>> from lp.services.messages.interfaces.message import IMessageSet
     >>> bug_one = bugset.get(1)
     >>> added_message = getUtility(IMessageSet).get("<yada-yada-test1>")[0]
-    >>> added_message in bug_one.messages
+
+We use set() here because the DecoratedResultSet used by Bug.messages
+doesn't currently support __contains__.
+
+    >>> added_message in set(bug_one.messages)
     True
     >>> print(bug_one.title)
     Better summary
@@ -522,7 +526,7 @@ to the bug:
 
     >>> added_message = getUtility(IMessageSet).get("<yada-yada-test3>")[0]
     >>> bug_one = bugset.get(1)
-    >>> added_message in bug_one.messages
+    >>> added_message in set(bug_one.messages)
     True
 
 In these tests, every time we log in, we're fully trusted again:
@@ -2962,7 +2966,7 @@ Attachments sent in replies to existing bugs are stored too.
     >>> new_message = getUtility(IMessageSet).get("comment-with-attachment")[
     ...     0
     ... ]
-    >>> new_message in bug_one.messages
+    >>> new_message in set(bug_one.messages)
     True
     >>> print_attachments(new_message.bugattachments)
     LibraryFileAlias attachment.txt text/plain UNSPECIFIED