launchpad-reviewers team mailing list archive

[Vaishnavi Asawale <mp+494558@xxxxxxxxxxxxxxxxxx>]

Vaishnavi Asawale has proposed merging ~vaishnavi-asawale/launchpad:fix-configure-archive-webhooks into launchpad:master.

Commit message:
Fix failing archive test
    
This MP proposes a fix to the tests broken by
https://code.launchpad.net/~vaishnavi-asawale/launchpad/+git/launchpad/+merge/494351
which allowed webhooks to be configured on archives. In this MP:
1. Add 'webhooks_collection_link' to the archive webservice response.
2. Update the test helper to delete the 'webhooks_collection_link' before
   any attempts of modifying it.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~vaishnavi-asawale/launchpad/+git/launchpad/+merge/494558
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~vaishnavi-asawale/launchpad:fix-configure-archive-webhooks into launchpad:master.

diff --git a/lib/lp/soyuz/stories/webservice/xx-archive.rst b/lib/lp/soyuz/stories/webservice/xx-archive.rst
index 931c4d2..550aad5 100644
--- a/lib/lp/soyuz/stories/webservice/xx-archive.rst
+++ b/lib/lp/soyuz/stories/webservice/xx-archive.rst
@@ -39,6 +39,7 @@ We publish a subset of their attributes.
     signing_key_fingerprint: None
     suppress_subscription_notifications: False
     web_link: 'http://launchpad.../~cprov/+archive/ubuntu/ppa'
+    webhooks_collection_link: 'http://.../~cprov/+archive/ubuntu/ppa/webhooks'
 
 For "devel" additional attributes are available.
 
@@ -76,6 +77,7 @@ For "devel" additional attributes are available.
     status: 'Active'
     suppress_subscription_notifications: False
     web_link: 'http://launchpad.../~cprov/+archive/ubuntu/ppa'
+    webhooks_collection_link: 'http://.../~cprov/+archive/ubuntu/ppa/webhooks'
 
 While the Archive signing key is being generated its
 'signing_key_fingerprint' attribute is None.
@@ -158,6 +160,7 @@ The archive has the following attributes:
     signing_key_fingerprint: None
     suppress_subscription_notifications: False
     web_link: 'http://launchpad.../ubuntutest/+archive/primary'
+    webhooks_collection_link: 'http://.../ubuntutest/+archive/primary/webhooks'
 
 A distribution can also provide a list of all its archives:
 
@@ -1401,8 +1404,13 @@ for admins, commercial admins, and PPA admins.
     >>> import json
     >>> def modify_archive(service, archive):
     ...     headers = {"Content-type": "application/json"}
+    ...     archive_data = dict(archive)
+    ...
+    ...     # We never want to edit the webhooks link in these tests
+    ...     del archive_data["webhooks_collection_link"]
+    ...
     ...     return service(
-    ...         archive["self_link"], "PUT", json.dumps(archive), headers
+    ...         archive["self_link"], "PUT", json.dumps(archive_data), headers
     ...     )
     ...
 
@@ -1512,6 +1520,7 @@ the IArchive context, in this case only Celso has it.
     signing_key_fingerprint: 'tag:launchpad.net:2008:redacted'
     suppress_subscription_notifications: False
     web_link: 'http://launchpad.../~cprov/+archive/ubuntu/p3a'
+    webhooks_collection_link: 'http://.../~cprov/+archive/ubuntu/p3a/webhooks'
 
     >>> pprint_entry(
     ...     cprov_webservice.get("/~cprov/+archive/ubuntu/p3a").jsonBody()
@@ -1537,6 +1546,7 @@ the IArchive context, in this case only Celso has it.
     signing_key_fingerprint: 'ABCDEF0123456789ABCDDCBA0000111112345678'
     suppress_subscription_notifications: False
     web_link: 'http://launchpad.../~cprov/+archive/ubuntu/p3a'
+    webhooks_collection_link: 'http://.../~cprov/+archive/ubuntu/p3a/webhooks'
 
 Creating subscriptions to a (private) archive
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~