Merge lp:~frankban/launchpad/setuplxc-remove-sleep into lp:~frankban/launchpad/more-integration

[Francesco Banconi]

== Changes ==

- Replaced *sleep 30* with an ssh/sleep loop.
- Removed unused function argument in *create_scripts*.

== Notes ==

The diff is against the merge of latest Benji's branch and devel.

[Gary Poster (gary)]

Thank you!

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2012-03-06 05:23:43 +0000
+++ database/schema/security.cfg	2012-03-08 16:34:46 +0000
@@ -140,7 +140,6 @@
 public.bugattachment                    = SELECT, INSERT, UPDATE, DELETE
 public.bugbranch                        = SELECT, INSERT, UPDATE, DELETE
 public.bugcve                           = SELECT, INSERT, DELETE
-public.bugjob                           = SELECT, INSERT, UPDATE, DELETE
 public.bugnomination                    = SELECT, UPDATE
 public.bugnotification                  = SELECT, INSERT, UPDATE, DELETE
 public.bugnotificationattachment        = SELECT, INSERT
@@ -564,7 +563,6 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugcve                           = SELECT, INSERT
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT, UPDATE
 public.bugmute                          = SELECT
 public.bugnomination                    = SELECT
@@ -1124,7 +1122,6 @@
 public.bug                              = SELECT, INSERT, UPDATE
 public.bugactivity                      = SELECT, INSERT, UPDATE
 public.bugattachment                    = SELECT, INSERT, UPDATE
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT, UPDATE
 public.bugmute                          = SELECT, INSERT, UPDATE, DELETE
 public.bugnomination                    = SELECT, INSERT, UPDATE, DELETE
@@ -1273,7 +1270,6 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugcve                           = SELECT, INSERT
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.bugmute                          = SELECT
 public.bugnomination                    = SELECT
@@ -1377,7 +1373,6 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugcve                           = SELECT, INSERT
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.bugmute                          = SELECT
 public.bugnomination                    = SELECT
@@ -1470,13 +1465,6 @@
 type=user
 groups=queued
 
-[ppad]
-groups=script
-public.archive                          = SELECT
-public.archivearch                      = SELECT
-public.person                           = SELECT
-type=user
-
 [session]
 type=user
 
@@ -1490,7 +1478,6 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugattachment                    = SELECT
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.bugmute                          = SELECT
 public.bugnomination                    = SELECT
@@ -1641,15 +1628,6 @@
 public.translationtemplateitem          = SELECT
 type=user
 
-[oopsprune]
-groups=script
-public.bug                              = SELECT
-public.bugtask                          = SELECT
-public.message                          = SELECT
-public.messagechunk                     = SELECT
-public.question                         = SELECT
-type=user
-
 [listteammembers]
 public.emailaddress                     = SELECT
 public.person                           = SELECT
@@ -1680,7 +1658,6 @@
 public.bugattachment                    = SELECT, INSERT
 public.bugbranch                        = SELECT
 public.bugcve                           = SELECT, INSERT
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.bugmute                          = SELECT
 public.bugnomination                    = SELECT, INSERT, UPDATE
@@ -1942,7 +1919,6 @@
 public.account                          = SELECT, INSERT, UPDATE
 public.bug                              = SELECT, INSERT, UPDATE
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.bugsubscription                  = SELECT, INSERT
 public.bugsubscriptionfilter            = SELECT, INSERT
@@ -2125,13 +2101,9 @@
 public.wikiname                         = SELECT, UPDATE
 type=user
 
-[weblogstats]
-public.libraryfilealias                 = SELECT
-public.libraryfiledownloadcount         = SELECT, INSERT, UPDATE, DELETE
-type=user
-
 [garbo]
 groups=script,read
+public.accesspolicy                     = SELECT, INSERT
 public.account                          = SELECT, DELETE
 public.answercontact                    = SELECT, DELETE
 public.branch                           = SELECT, UPDATE
@@ -2142,7 +2114,6 @@
 public.bug                              = SELECT, UPDATE
 public.bugaffectsperson                 = SELECT
 public.bugattachment                    = SELECT, DELETE
-public.bugjob                           = SELECT, INSERT
 public.bugmessage                       = SELECT, UPDATE
 public.bugnotification                  = SELECT, DELETE
 public.bugnotificationfilter            = SELECT, DELETE
@@ -2236,19 +2207,6 @@
 public.branch                           = SELECT
 type=user
 
-[calculate-bug-heat]
-groups=script,read
-public.bug                              = SELECT, UPDATE
-public.bugjob                           = SELECT, DELETE
-public.distribution                     = SELECT, UPDATE
-public.distributionsourcepackage        = SELECT, INSERT, UPDATE
-public.distroseries                     = SELECT
-public.job                              = SELECT, UPDATE, DELETE
-public.product                          = SELECT, UPDATE
-public.productseries                    = SELECT
-public.project                          = SELECT, UPDATE
-type=user
-
 [lagmon]
 public.update_replication_lag_cache()   = EXECUTE
 type=user

=== modified file 'lib/canonical/launchpad/icing/css/colours.css'
--- lib/canonical/launchpad/icing/css/colours.css	2012-03-07 00:23:37 +0000
+++ lib/canonical/launchpad/icing/css/colours.css	2012-03-08 16:34:46 +0000
@@ -346,23 +346,3 @@
 .red {
     color: red;
 }
-
-.accessPolicyPUBLIC, .accessPolicyPUBLIC a {
-    color: green;
-    }
-
-.accessPolicyUNEMBARGOEDSECURITY, .accessPolicyUNEMBARGOEDSECURITY a {
-    color: #1f7dff;
-    }
-
-.accessPolicyEMBARGOEDSECURITY, .accessPolicyEMBARGOEDSECURITY a {
-    color: #ff4500;
-    }
-
-.accessPolicyUSERDATA, .accessPolicyUSERDATA a {
-    color: #800080;
-    }
-
-.accessPolicyPROPRIETARY, .accessPolicyPROPRIETARY a {
-    color: red;
-    }

=== removed file 'lib/canonical/launchpad/icing/shipit.css'
--- lib/canonical/launchpad/icing/shipit.css	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/icing/shipit.css	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-/* === Overall presentation === */
-
-html {
-  position: relative;
-  font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
-  font-size: 12pt;
-  color: black;
-  background-color: #FFFFFF;
-}
-body {margin: 0; padding: 0;}
-
-div.body {padding: 0em 1em;}
-
-.discreet, .lesser {font-size: small;}
-
-/* --- Error, warning, and info messages --- */
-
-.error, .warning, .informational {
-  padding: 0.5em;
-}
-.message {
-  background: 5px 0.5em no-repeat;
-  font-weight: bold;
-  margin: 1em 0 0.5em;
-  padding: 0.5em 1em 0.5em 30px; /* 30px because the image has a pixel size */
-}
-.error .message, .warning .message, .informational .message {
-  margin: 0.25em 0 0;
-  padding: 0 0 0 25px;
-  background: 0 0 no-repeat;
-}
-.error {background-color: #f0cccc; color: black;}
-.error.message, .error .message {
-  background-image: url(/@@/error);
-}
-.warning {background-color: #fcdd99; color: black;}
-.warning.message, .warning .message {
-  background-image: url(/@@/warning);
-}
-.informational {background-color: #fcfc99; color: black;}
-.informational.message, .informational .message {
-  background-image: url(/@@/info);
-}
-.debugging {background-color: #666; color: white;}
-.debugging.message, .debugging .message {
-  background-image: url(/@@/info);
-}
-
-/* --- Form controls --- */
-
-form {border: 0; margin: 0; padding: 0;}
-input, select, textarea {
-  background-color: #fff;
-  color: #656565;
-  font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
-  margin: 0;
-}
-input[type="text"], input[type="submit"], input[type="reset"], textarea {
-  font-size: 1em; /* Forces a readable font size in Safari */
-}
-input.urlTextType {width: 100%;}
-.fieldRequired, .fieldOptional {color: #999;}
-.formHelp {margin-bottom: 1em;}
-textarea {width: 100%;}
-table.form {width: 100%;}
-
-/* === Tables === */
-
-table.latest th, table.latest td {padding-bottom: 2em;}
-table.summary {float: right; margin: 0 0 1em 1em;}
-table.summary caption {font-style: italic; margin-left: 1em;}
-div.right table.summary {float: none; margin: 1em auto;}
-table.summary tr {border: dotted #ccc; border-width: 1px 0;}
-table.summary td {padding-left: 0.5em;}
-table.summary ul, table.summary ul li {
-  list-style-position: inside;
-  margin: 0;
-  padding: 0;
-}
-th, td {padding: 0.25em;}
-th.icon, td.icon {vertical-align: top; white-space: nowrap; width: 1px;}
-th.icon.left, td.icon.left {padding-right: 0;}
-th.icon.right, td.icon.right {padding-left: 0;}
-th.nowrap, td.nowrap {white-space: nowrap;}
-tfoot th, table.contributions th {text-align: left;}
-table.contributions, table.contributions th, table.contributions td {
-  border: 1px solid #e6e6e6;}
-table.contributions tr.odd {background-color: #fff; color: inherit;}
-table.contributions tr.even {background-color: #f6f6f6; color: inherit;}
-table.contributions th, table.contributions td {padding: 0.5em 0.75em;}
-table.contributions td {vertical-align: middle; width: 16px;}
-table.headers-right-aligned th {text-align: right;}
-
-/* --- Listing tables --- */
-
-table.listing {margin: 0; width: 100%;}
-table.listing, table.listing tbody {border-bottom: 1px solid #d2d2d2;}
-table.listing thead, table.listing thead th, table.listing tfoot tr {
-  border: 1px solid #d2d2d2;
-  background-color: #fff;
-}
-table.listing tfoot td {border: 1px solid #d2d2d2;}
-table.listing thead td {border: none;}
-tr.highlight {background-color: #ff9;}
-table.listing tr.note {font-size: smaller;}
-tr.amount, td.amount {text-align: right;}
-table.listing th, table.listing td {padding: 0.25em;}
-table.listing th {font-size: 1.125em; white-space: nowrap;}
-table.listing td {border: 1px #d2d2d2; border-style: dotted none none none;}
-table.listing tr.note td {border-style: none;}
-table.listing img {vertical-align: middle;}
-table.listing tr.secondary th, table.listing tr.secondary td {border-top: none;}
-table.listing table tbody, table.listing table thead,
-table.listing table thead th, table.listing tfoot tr,
-table.listing table tfoot td, table.listing table td {
-  border: none;
-}
-
-
-/* --- Sortable tables --- */
-
-table.sortable a.sortheader {
-  color:#666666;
-  font-weight: bold;
-  text-decoration: none;
-  display: block;
-}
-table.sortable img.sortarrow {
-  padding-left: 2px;
-}
-th.ascending {
-  background-image: url(/@@/arrowDown);
-  background-position: center right;
-  background-repeat: no-repeat;
-}
-th.descending {
-  background-image: url(/@@/arrowUp);
-  background-position: center right;
-  background-repeat: no-repeat;
-}
-/* Used to indicate a value to be used to sort cells in a row */
-.sortkey, .revsortkey {display: none;}
-
-
-:link {
-  color: #660000;
-}
-:visited {
-  color: #993333;
-}

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2012-02-15 22:09:43 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2012-03-08 16:34:46 +0000
@@ -474,25 +474,24 @@
 
 
 <metal:debug-timeline define-macro="debug-timeline">
-  <a name="debug_timeline"
-    id="debug_timeline"
-    class="hidden"
-    >
-    <table
-      tal:condition="request/features/visible_render_time"
-      tal:define="timeline_actions modules/lp.services.webapp.adapter/get_timeline_actions"
-      class="debug-timeline listing"
-      >
+  <a tal:condition="request/features/visible_render_time"
+     tal:define="timeline_actions modules/lp.services.webapp.adapter/get_timeline_actions"
+     id="debug_timeline" class="hidden">
+    <table class="debug-timeline listing">
       <thead>
-	<th>Duration</th>
-	<th>Action</th>
+        <tr>
+          <th>Duration</th>
+          <th>Action</th>
+        </tr>
       </thead>
-      <tr tal:repeat="action timeline_actions">
-	<td class="amount" tal:content="action/duration/fmt:millisecondduration"/>
-	<td style="font-family: monospace; text-align: left;">
-          <pre class="wrap"><span class="action-category" tal:content="action/category"/>: <span class="action-details" tal:content="action/detail"/></pre>
-	</td>
-      </tr>
+      <tbody>
+        <tr tal:repeat="action timeline_actions">
+          <td class="amount" tal:content="action/duration/fmt:millisecondduration"/>
+          <td style="font-family: monospace; text-align: left;">
+            <pre class="wrap"><span class="action-category" tal:content="action/category"/>: <span class="action-details" tal:content="action/detail"/></pre>
+          </td>
+        </tr>
+      </tbody>
     </table>
   </a>
 </metal:debug-timeline>

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2012-02-24 04:54:53 +0000
+++ lib/lp/app/templates/base-layout.pt	2012-03-08 16:34:46 +0000
@@ -43,15 +43,6 @@
       html, body {background-image: url(/@@/demo) !important;}
     </style>
 
-    <tal:comment condition="nothing">
-      Removing the below <noscript></noscript> snippet makes two tests fail
-      with redirection problems:
-        xx-ubuntu-filebug.txt
-        xx-bug-reporting-tools.txt
-      No time to look into it now, so keeping it in. XXX Danilo 20110715
-    </tal:comment>
-    <noscript></noscript>
-
     <tal:view condition="not: view/macro:is-page-contentless">
       <meta name="description"
         tal:condition="view/page_description | nothing"
@@ -176,6 +167,21 @@
 
     <metal:lp-client-cache
       use-macro="context/@@+base-layout-macros/lp-client-cache" />
+    <metal:debug-timeline
+      use-macro="context/@@+base-layout-macros/debug-timeline" />
+    <tal:comment
+        tal:condition="request/features/visible_render_time"
+        define="render_time modules/lp.services.webapp.adapter/summarize_requests;"
+        replace='structure string:&lt;script type="text/javascript"&gt;
+      var render_time = "${render_time}";
+      LPJS.use("node", "lp.ajax_log" , function(Y) {
+        Y.on("domready", function() {
+          var node = Y.one("#rendertime");
+          node.set("innerHTML", render_time);
+          var ajax_log = new Y.lp.ajax_log();
+        });
+      });
+    &lt;/script&gt;' />
   </body>
 
 <tal:template>
@@ -196,24 +202,5 @@
 
     --&gt;" />
 </tal:template>
-
-
-<metal:debug-timeline
-  use-macro="context/@@+base-layout-macros/debug-timeline" />
-
-<tal:comment
-    tal:condition="request/features/visible_render_time"
-    define="render_time modules/lp.services.webapp.adapter/summarize_requests;"
-    replace='structure string:&lt;script type="text/javascript"&gt;
-  var render_time = "${render_time}";
-  LPJS.use("node", "lp.ajax_log" , function(Y) {
-    Y.on("domready", function() {
-      var node = Y.one("#rendertime");
-      node.set("innerHTML", render_time);
-      var ajax_log = new Y.lp.ajax_log();
-    });
-  });
-&lt;/script&gt;' />
-
 </html>
 </metal:page>

=== modified file 'lib/lp/app/templates/root-index.pt'
--- lib/lp/app/templates/root-index.pt	2012-02-24 04:44:55 +0000
+++ lib/lp/app/templates/root-index.pt	2012-03-08 16:34:46 +0000
@@ -136,7 +136,7 @@
               xml:lang="en" lang="en" dir="ltr"
               tal:attributes="action string:${rooturl}+search"
               method="get" accept-charset="UTF-8">
-              <input id="text" type="text" name="field.text" size="25%" />
+              <input id="text" type="text" name="field.text" size="25" />
               <input id="search" type="submit" value="Search Launchpad" />
             </form>
             <script type="text/javascript">

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-bug-reporting-tools.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-bug-reporting-tools.txt	2011-12-29 05:29:36 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-bug-reporting-tools.txt	2012-03-08 16:34:46 +0000
@@ -61,22 +61,26 @@
 The most common case will be that the user is sent to the guided
 +filebug page and the user goes through the workflow there.
 
-    >>> filebug_url = (
-    ...    'http://launchpad.dev/ubuntu/+source/mozilla-firefox/+filebug/'
-    ...     '%s' % blob_token)
-    >>> user_browser.open(filebug_url)
+    >>> filebug_host = 'launchpad.dev'
+    >>> filebug_path = (
+    ...    '/ubuntu/+source/mozilla-firefox/+filebug/%s' % blob_token)
+    >>> filebug_url = 'http://%s%s' % (filebug_host, filebug_path)
+    >>> contents = str(http(
+    ...     "GET %s HTTP/1.1\nHostname: %s\n"
+    ...     "Authorization: Basic [e-mail]:test\n\n"
+    ...     % (filebug_path, filebug_host)))
 
 At first, the user will be shown a message telling them that the extra
 data is being processed.
 
-    >>> for message in find_tags_by_class(user_browser.contents, 'message'):
+    >>> for message in find_tags_by_class(contents, 'message'):
     ...     print message.renderContents()
     Please wait while bug data is processed. This page will refresh
     every 10 seconds until processing is complete.
 
 The page header contains a 10-second meta refresh tag.
 
-    >>> '<meta http-equiv="refresh" content="10"' in user_browser.contents
+    >>> '<meta http-equiv="refresh" content="10"' in contents
     True
 
 Once the data has been processed, the +filebug process can continue as

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2011-12-29 05:29:36 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2012-03-08 16:34:46 +0000
@@ -71,6 +71,14 @@
     ...     extra_filebug_data, 'not/important', 'not.important')
     >>> anon_browser.getControl(name='FORM_SUBMIT').click()
     >>> blob_token = anon_browser.headers['X-Launchpad-Blob-Token']
+    >>> from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
+    >>> login('[e-mail]')
+    >>> job = getUtility(IProcessApportBlobJobSource).getByBlobUUID(
+    ...     blob_token)
+    >>> job.job.start()
+    >>> job.run()
+    >>> job.job.complete()
+    >>> logout()
     >>> filebug_url = (
     ...    'http://launchpad.dev/ubuntu/+source/mozilla-firefox/+filebug/'
     ...     '%s' % blob_token)

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2012-03-05 01:20:59 +0000
+++ lib/lp/registry/browser/pillar.py	2012-03-08 16:34:46 +0000
@@ -240,8 +240,8 @@
         return getUtility(IService, 'accesspolicy')
 
     @property
-    def access_policies(self):
-        return self._getAccessPolicyService().getAccessPolicies(self.context)
+    def information_types(self):
+        return self._getAccessPolicyService().getInformationTypes(self.context)
 
     @property
     def sharing_permissions(self):
@@ -279,6 +279,6 @@
         if not getFeatureFlag('disclosure.enhanced_sharing.enabled'):
             raise Unauthorized("This feature is not yet available.")
         cache = IJSONRequestCache(self.request)
-        cache.objects['access_policies'] = self.access_policies
+        cache.objects['information_types'] = self.information_types
         cache.objects['sharing_permissions'] = self.sharing_permissions
         cache.objects['observer_data'] = self.observer_data

=== modified file 'lib/lp/registry/browser/tests/test_pillar_sharing.py'
--- lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-03-03 04:28:09 +0000
+++ lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-03-08 16:34:46 +0000
@@ -81,7 +81,7 @@
         with FeatureFixture(FLAG):
             view = create_initialized_view(self.pillar, name='+sharing')
             cache = IJSONRequestCache(view.request)
-            self.assertIsNotNone(cache.objects.get('access_policies'))
+            self.assertIsNotNone(cache.objects.get('information_types'))
             self.assertIsNotNone(cache.objects.get('sharing_permissions'))
             aps = getUtility(IService, 'accesspolicy')
             observers = aps.getPillarObservers(self.pillar)

=== modified file 'lib/lp/registry/interfaces/accesspolicy.py'
--- lib/lp/registry/interfaces/accesspolicy.py	2012-03-07 01:24:33 +0000
+++ lib/lp/registry/interfaces/accesspolicy.py	2012-03-08 16:34:46 +0000
@@ -153,6 +153,9 @@
     def findByPolicy(policies):
         """Return all `IAccessPolicyArtifact` objects for the policies."""
 
+    def deleteByArtifact(artifacts):
+        """Delete all `IAccesyPolicyArtifact` objects for the artifacts."""
+
 
 class IAccessPolicySource(Interface):
 
@@ -218,3 +221,10 @@
 
         :param policies: a collection of `IAccesPolicy`s.
         """
+
+    def findArtifactsByGrantee(grantee, policies):
+        """Find the `IAccessArtifact`s for grantee and policies.
+
+        :param grantee: the access artifact grantee.
+        :param policies: a collection of `IAccesPolicy`s.
+        """

=== modified file 'lib/lp/registry/interfaces/accesspolicyservice.py'
--- lib/lp/registry/interfaces/accesspolicyservice.py	2012-03-07 02:04:23 +0000
+++ lib/lp/registry/interfaces/accesspolicyservice.py	2012-03-08 16:34:46 +0000
@@ -39,11 +39,11 @@
     # version 'devel'
     export_as_webservice_entry(publish_web_link=False, as_of='beta')
 
-    def getAccessPolicies(pillar):
-        """Return the allowed access policy types for the given pillar."""
+    def getInformationTypes(pillar):
+        """Return the allowed information types for the given pillar."""
 
     def getSharingPermissions():
-        """Return the access policy sharing permissions."""
+        """Return the information sharing permissions."""
 
     @export_read_operation()
     @operation_parameters(
@@ -57,22 +57,23 @@
     @operation_parameters(
         pillar=Reference(IPillar, title=_('Pillar'), required=True),
         observer=Reference(IPerson, title=_('Observer'), required=True),
-        access_policy_types=List(Choice(vocabulary=InformationType)))
+        information_types=List(Choice(vocabulary=InformationType)))
     @operation_for_version('devel')
-    def updatePillarObserver(pillar, observer, access_policy_types, user):
-        """Ensure observer has the grants for access policies on a pillar."""
+    def updatePillarObserver(pillar, observer, information_types, user):
+        """Ensure observer has the grants for information types on a pillar."""
 
     @export_write_operation()
     @operation_parameters(
         pillar=Reference(IPillar, title=_('Pillar'), required=True),
         observer=Reference(IPerson, title=_('Observer'), required=True),
-        access_policy_type=Choice(vocabulary=InformationType, required=False))
+        information_types=List(
+            Choice(vocabulary=InformationType), required=False))
     @operation_for_version('devel')
-    def deletePillarObserver(pillar, observer, access_policy_type):
+    def deletePillarObserver(pillar, observer, information_types):
         """Remove an observer from a pillar.
 
         :param pillar: the pillar from which to remove access
         :param observer: the person or team to remove
-        :param access_policy_type: if None, remove all access, otherwise just
-                                   remove the specified access_policy
+        :param information_types: if None, remove all access, otherwise just
+                                   remove the specified access_policies
         """

=== modified file 'lib/lp/registry/javascript/disclosure/observerpicker.js'
--- lib/lp/registry/javascript/disclosure/observerpicker.js	2012-03-06 20:58:51 +0000
+++ lib/lp/registry/javascript/disclosure/observerpicker.js	2012-03-08 16:34:46 +0000
@@ -18,13 +18,13 @@
 
 ObserverPicker.ATTRS = {
    /**
-    * The value, in percentage, of the progress bar.
+    * The available information types.
     *
-    * @attribute access_policies
+    * @attribute information_types
     * @type Object
     * @default []
     */
-    access_policies: {
+    information_types: {
         value: []
     },
     // Override for testing
@@ -37,13 +37,13 @@
 Y.extend(ObserverPicker, Y.lazr.picker.Picker, {
     initializer: function(config) {
         ObserverPicker.superclass.initializer.apply(this, arguments);
-        var access_policies = [];
+        var information_types = [];
         if (config !== undefined) {
-            if (config.access_policies !== undefined) {
-                access_policies = config.access_policies;
+            if (config.information_types !== undefined) {
+                information_types = config.information_types;
             }
         }
-        this.set('access_policies', access_policies);
+        this.set('information_types', information_types);
         var self = this;
         this.subscribe('save', function (e) {
             e.preventDefault();
@@ -98,7 +98,7 @@
     },
 
     _display_step_two: function(data) {
-        var title = Y.Lang.substitute('Select access policy for {name}',
+        var title = Y.Lang.substitute('Select sharing policy for {name}',
             {name: data.title});
         this.set('steptitle', title);
         this.set('progress', 75);
@@ -132,17 +132,17 @@
     },
 
     _publish_result: function(data) {
-        // Determine the chosen access policy type. data already contains the
+        // Determine the chosen information type. data already contains the
         // selected person due to the base picker behaviour.
         var contentBox = this.get('contentBox');
-        var selected_access_policies = [];
+        var selected_info_types = [];
         contentBox.all('input[name=field.visibility]')
             .each(function(node) {
                 if (node.get('checked')) {
-                    selected_access_policies.push(node.get('value'));
+                    selected_info_types.push(node.get('value'));
                 }
             });
-        data.access_policies = selected_access_policies;
+        data.information_types = selected_info_types;
         // Publish the result with step_nr 0 to indicate we have finished.
         this.fire('save', data, 0);
     },
@@ -173,7 +173,7 @@
             '{{/policies}}',
             '</tbody></table></div>'
         ].join(''), {
-            policies: this.get('access_policies')
+            policies: this.get('information_types')
         });
         return Y.Node.create(html);
     },

=== modified file 'lib/lp/registry/javascript/disclosure/observertable.js'
--- lib/lp/registry/javascript/disclosure/observertable.js	2012-03-06 05:22:53 +0000
+++ lib/lp/registry/javascript/disclosure/observertable.js	2012-03-08 16:34:46 +0000
@@ -33,8 +33,8 @@
     observers: {
         value: []
     },
-    // The access policy types: public, publicsecurity, userdata etc.
-    access_policy_types: {
+    // The information types: public, embargoedsecurity, userdata etc.
+    information_types: {
         value: {}
     },
     // The sharing permission choices: all, some, nothing etc.
@@ -109,7 +109,8 @@
             '<td id="remove-{{name}}">',
             '    <a title="Share nothing with this user"',
             '       href="#" class="sprite remove"' +
-            '        data-self_link="{{self_link}}">',
+            '        data-self_link="{{self_link}}"' +
+            '        data-person_name="{{display_name}}">',
             '    </a>',
             '</td>',
             '<td id="td-permission-{{name}}">',
@@ -126,19 +127,19 @@
 
     _observer_policy_template: function() {
         return [
-           '{{#access_policies}}',
+           '{{#information_types}}',
            '<li><span id="{{policy}}-permission-{{observer_name}}">',
            '  <span class="value"></span>',
            '  <a class="editicon sprite edit" href="#">&nbsp;</a>',
            '</span></li>',
-           '{{/access_policies}}'].join(' ');
+           '{{/information_types}}'].join(' ');
     },
 
     // Render the popup widget to pick the sharing permission for an
     // access policy.
     render_observer_policy: function(
             observer, policy, current_value) {
-        var access_policy_types = this.get('access_policy_types');
+        var information_types = this.get('information_types');
         var sharing_permissions = this.get('sharing_permissions');
         var choice_items = [];
         Y.Array.forEach(sharing_permissions, function(permission) {
@@ -148,7 +149,7 @@
                 value: permission.value,
                 name: permission.title,
                 source_name: Y.Lang.substitute(source_name,
-                    {policy_name: access_policy_types[policy],
+                    {policy_name: information_types[policy],
                      permission_name: permission.title})
             });
         });
@@ -165,7 +166,7 @@
             value_location: value_location,
             editicon: editicon,
             value: current_value,
-            title: "Share " + access_policy_types[policy] + " with "
+            title: "Share " + information_types[policy] + " with "
                 + observer.display_name,
             items: choice_items,
             elementToFlash: contentBox,
@@ -215,7 +216,8 @@
             e.preventDefault();
             var delete_link = e.currentTarget;
             var observer_link = delete_link.getAttribute('data-self_link');
-            self.fire(REMOVE_OBSERVER, delete_link, observer_link);
+            var person_name = delete_link.getAttribute('data-person_name');
+            self.fire(REMOVE_OBSERVER, delete_link, observer_link, person_name);
         }, 'td[id^=remove-] a');
     },
 
@@ -226,12 +228,12 @@
     _prepareObserverDisplayData: function(observers) {
         Y.Array.forEach(observers, function(observer) {
             var observer_policies = observer.permissions;
-            var policy_values = [];
+            var info_types = [];
             Y.each(observer_policies, function(policy_value, policy) {
-                policy_values.push({policy: policy,
+                info_types.push({policy: policy,
                                     observer_name: observer.name});
             });
-            observer.access_policies = policy_values;
+            observer.information_types = info_types;
         });
     },
 

=== modified file 'lib/lp/registry/javascript/disclosure/pillarsharingview.js'
--- lib/lp/registry/javascript/disclosure/pillarsharingview.js	2012-03-06 12:03:09 +0000
+++ lib/lp/registry/javascript/disclosure/pillarsharingview.js	2012-03-08 16:34:46 +0000
@@ -54,7 +54,7 @@
             headerContent: Y.Node.create("<h2></h2>").set('text', header),
             zIndex: 1000,
             visible: false,
-            access_policies: LP.cache.access_policies,
+            information_types: LP.cache.information_types,
             save: function(result) {
                 self.save_sharing_selection(result);
             }
@@ -68,9 +68,9 @@
     destructor: function() { },
 
     renderUI: function() {
-        var access_policy_types = {};
-        Y.Array.each(LP.cache.access_policies, function(policy) {
-            access_policy_types[policy.value] = policy.title;
+        var information_types = {};
+        Y.Array.each(LP.cache.information_types, function(info_type) {
+            information_types[info_type.value] = info_type.title;
         });
         var sharing_permissions = LP.cache.sharing_permissions;
         var observer_data = LP.cache.observer_data;
@@ -78,7 +78,7 @@
         var observer_table = new otns.ObserverTableWidget({
             observers: observer_data,
             sharing_permissions: sharing_permissions,
-            access_policy_types: access_policy_types
+            information_types: information_types
         });
         this.set('observer_table', observer_table);
         observer_table.render();
@@ -95,7 +95,8 @@
         var otns = Y.lp.registry.disclosure.observertable;
         observer_table.subscribe(
             otns.ObserverTableWidget.REMOVE_OBSERVER, function(e) {
-                self.perform_remove_observer(e.details[0], e.details[1]);
+                self.confirm_observer_removal(
+                    e.details[0], e.details[1], e.details[2]);
         });
     },
 
@@ -129,6 +130,32 @@
     },
 
     /**
+     * Prompt the user to confirm the removal of the selected observer.
+     *
+     * @method confirm_observer_removal
+     */
+    confirm_observer_removal: function(delete_link, person_uri, person_name) {
+        var confirm_text_template = [
+            '<p class="large-warning" style="padding:2px 2px 0 36px;">',
+            '    Do you really want to stop sharing',
+            '    "{pillar}" with {person_name}?<br><br>',
+            '</p>'
+            ].join('');
+        var confirm_text = Y.Lang.sub(confirm_text_template,
+                {pillar: LP.cache.context.display_name,
+                 person_name: person_name});
+        var self = this;
+        var co = new Y.lp.app.confirmationoverlay.ConfirmationOverlay({
+            submit_fn: function() {
+                self.perform_remove_observer(delete_link, person_uri);
+            },
+            form_content: confirm_text,
+            headerContent: '<h2>Stop sharing</h2>'
+        });
+        co.show();
+    },
+
+    /**
      * The server call to remove the specified observer has succeeded.
      * Update the model and view.
      * @method remove_observer_success
@@ -236,7 +263,7 @@
             parameters: {
                 pillar: pillar_uri,
                 observer: person_uri,
-                access_policy_types: selection_result.access_policies
+                information_types: selection_result.information_types
             }
         };
         this.get('lp_client').named_post(
@@ -250,5 +277,6 @@
 }, "0.1", { "requires": [
     'node', 'lp.client', 'lp.mustache', 'lazr.picker', 'lp.app.picker',
     'lp.mustache', 'lp.registry.disclosure.observerpicker',
-    'lp.registry.disclosure.observertable'] });
+    'lp.registry.disclosure.observertable', 'lp.app.confirmationoverlay'
+    ]});
 

=== modified file 'lib/lp/registry/javascript/disclosure/tests/test_observerpicker.js'
--- lib/lp/registry/javascript/disclosure/tests/test_observerpicker.js	2012-03-06 12:03:09 +0000
+++ lib/lp/registry/javascript/disclosure/tests/test_observerpicker.js	2012-03-08 16:34:46 +0000
@@ -18,7 +18,7 @@
                     "description": "[e-mail]", "api_uri": "~/frieda",
                     "metadata": "team"}
             ];
-            this.access_policies = [
+            this.information_types = [
                 {index: '0', value: 'P1', title: 'Policy 1',
                  description: 'Policy 1 description'},
                 {index: '1', value: 'P2', title: 'Policy 2',
@@ -46,7 +46,7 @@
 
         _create_picker: function(overrides) {
             var config = {
-                anim_duratrion: 0,
+                anim_duration: 0,
                 progressbar: true,
                 progress: 50,
                 headerContent: "<h2>Grant access</h2>",
@@ -54,7 +54,7 @@
                             "with whom to share",
                 zIndex: 1000,
                 visible: false,
-                access_policies: this.access_policies
+                information_types: this.information_types
             };
             if (overrides !== undefined) {
                 config = Y.merge(config, overrides);
@@ -103,15 +103,16 @@
             // The step title should be updated according to the selected
             // person.
             steptitle = cb.one('.contains-steptitle h2').getContent();
-            Y.Assert.areEqual('Select access policy for Fred', steptitle);
+            Y.Assert.areEqual(
+                'Select sharing policy for Fred', steptitle);
             // The second step ui should be visible.
             var step_two_content = cb.one('.picker-content-two');
             Y.Assert.isFalse(step_two_content.hasClass('unseen'));
             // The second step ui should contain input buttons for each access
             // policy type.
-            Y.Array.each(this.access_policies, function(policy) {
+            Y.Array.each(this.information_types, function(info_type) {
                 var rb = step_two_content.one(
-                    'input[value="' + policy.title + '"]');
+                    'input[value="' + info_type.title + '"]');
                 Y.Assert.isNotNull(rb);
             });
             // There should be a link back to previous step.
@@ -170,7 +171,7 @@
             var select_link = step_two_content.one('a.next');
             select_link.simulate('click');
             Y.ArrayAssert.itemsAreEqual(
-                ['Policy 2'], selected_result.access_policies);
+                ['Policy 2'], selected_result.information_types);
             Y.Assert.areEqual('~/fred', selected_result.api_uri);
         }
     }));

=== modified file 'lib/lp/registry/javascript/disclosure/tests/test_observertable.js'
--- lib/lp/registry/javascript/disclosure/tests/test_observertable.js	2012-03-06 05:22:53 +0000
+++ lib/lp/registry/javascript/disclosure/tests/test_observertable.js	2012-03-08 16:34:46 +0000
@@ -25,7 +25,7 @@
                 {'value': 's2', 'title': 'S2',
                  'description': 'Sharing 2'}
             ];
-            this.access_policies = {
+            this.information_types = {
                 'P1': 'Policy 1',
                 'P2': 'Policy 2',
                 'P3': 'Policy 3'
@@ -42,7 +42,7 @@
                 anim_duration: 0.001,
                 observers: this.observer_data,
                 sharing_permissions: this.sharing_permissions,
-                access_policy_types: this.access_policies
+                information_types: this.information_types
             });
         },
 
@@ -70,7 +70,7 @@
             Y.Assert.isNotNull(
                 Y.one('#observer-table td[id=remove-'
                       + observer.name + '] a'));
-            // The access policy sharing permissions
+            // The sharing permissions
             var permission;
             for (permission in observer.permissions) {
                 if (observer.permissions.hasOwnProperty(permission)) {
@@ -120,7 +120,9 @@
                 ns.ObserverTableWidget.REMOVE_OBSERVER, function(e) {
                     var delete_link = e.details[0];
                     var observer_uri = e.details[1];
+                    var person_name = e.details[2];
                     Y.Assert.areEqual('~fred', observer_uri);
+                    Y.Assert.areEqual('Fred Bloggs', person_name);
                     Y.Assert.areEqual(delete_link_to_click, delete_link);
                     event_fired = true;
                 }

=== modified file 'lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.html'
--- lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.html	2012-03-01 05:46:50 +0000
+++ lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.html	2012-03-08 16:34:46 +0000
@@ -33,12 +33,16 @@
       <script type="text/javascript"
           src="../../../../../../build/js/lp/app/lp.js"></script>
       <script type="text/javascript"
+          src="../../../../../../build/js/lp/app/confirmationoverlay/confirmationoverlay.js"></script>
+      <script type="text/javascript"
           src="../../../../../../build/js/lp/app/mustache.js"></script>
       <script type="text/javascript"
           src="../../../../../../build/js/lp/app/activator/activator.js"></script>
       <script type="text/javascript"
           src="../../../../../../build/js/lp/app/choiceedit/choiceedit.js"></script>
       <script type="text/javascript"
+          src="../../../../../../build/js/lp/app/formoverlay/formoverlay.js"></script>
+      <script type="text/javascript"
           src="../../../../../../build/js/lp/app/overlay/overlay.js"></script>
       <script type="text/javascript"
           src="../../../../../../build/js/lp/app/picker/picker.js"></script>

=== modified file 'lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.js'
--- lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.js	2012-03-06 12:03:09 +0000
+++ lib/lp/registry/javascript/disclosure/tests/test_pillarsharingview.js	2012-03-08 16:34:46 +0000
@@ -31,7 +31,7 @@
                         {'value': 's2', 'title': 'S2',
                          'description': 'Sharing 2'}
                     ],
-                    access_policies: [
+                    information_types: [
                         {index: '0', value: 'P1', title: 'Policy 1',
                          description: 'Policy 1 description'},
                         {index: '1', value: 'P2', title: 'Policy 2',
@@ -88,24 +88,65 @@
                     .hasClass('yui3-observer_picker-hidden'));
         },
 
-        // Clicking a delete observer link calls the perform_remove_observer
+        // Clicking a delete observer link calls the confirm_observer_removal
         // method with the correct parameters.
         test_delete_observer_click: function() {
             this.view = this._create_Widget();
             this.view.render();
+            var confirmRemove_called = false;
+            this.view.confirm_observer_removal = function(
+                    delete_link, person_uri, person_name) {
+                Y.Assert.areEqual('~fred', person_uri);
+                Y.Assert.areEqual('Fred Bloggs', person_name);
+                Y.Assert.areEqual(delete_link_to_click, delete_link);
+                confirmRemove_called = true;
+
+            };
+            var delete_link_to_click =
+                Y.one('#observer-table td[id=remove-fred] a');
+            delete_link_to_click.simulate('click');
+            Y.Assert.isTrue(confirmRemove_called);
+        },
+
+        //Test the behaviour of the removal confirmation dialog.
+        _test_confirm_observer_removal: function(click_ok) {
+            this.view = this._create_Widget();
+            this.view.render();
             var performRemove_called = false;
-            var self = this;
             this.view.perform_remove_observer = function(
                     delete_link, person_uri) {
                 Y.Assert.areEqual('~fred', person_uri);
-                Y.Assert.areEqual(delete_link_to_click, delete_link);
+                Y.Assert.areEqual(delete_link, delete_link);
                 performRemove_called = true;
 
             };
-            var delete_link_to_click =
+            var delete_link =
                 Y.one('#observer-table td[id=remove-fred] a');
-            delete_link_to_click.simulate('click');
-            Y.Assert.isTrue(performRemove_called);
+            this.view.confirm_observer_removal(
+                delete_link, '~fred', 'Fred Bloggs');
+            var co = Y.one('.yui3-overlay.yui3-lp-app-confirmationoverlay');
+            var actions = co.one('.yui3-lazr-formoverlay-actions');
+            var btn_style;
+            if (click_ok) {
+                btn_style = '.ok-btn';
+            } else {
+                btn_style = '.cancel-btn';
+            }
+            var button = actions.one(btn_style);
+            button.simulate('click');
+            Y.Assert.areEqual(click_ok, performRemove_called);
+            Y.Assert.isTrue(
+                    co.hasClass('yui3-lp-app-confirmationoverlay-hidden'));
+        },
+
+        //Test the remove confirmation dialog when the user clicks Ok.
+        test_confirm_observer_removal_ok: function() {
+            this._test_confirm_observer_removal(true);
+        },
+
+        //Test the remove confirmation dialog when the user clicks Cancel.
+        test_confirm_observer_removal_cancel: function() {
+            this._test_confirm_observer_removal(false);
         },
 
         // The perform_remove_observer method makes the expected XHR calls.
@@ -174,7 +215,7 @@
                 Y.Assert.areEqual('joe', observer.name);
                 save_sharing_selection_success_called = true;
             };
-            // Use the picker to select a new observer and access policy.
+            // Use the picker to select a new observer and information type.
             var observer_picker = this.view.get('observer_picker');
             var picker_results = [
                 {"value": "joe", "title": "Joe", "css": "sprite-person",
@@ -203,7 +244,7 @@
             expected_url = Y.lp.client.append_qs(
                 expected_url, 'observer', person_uri);
             expected_url = Y.lp.client.append_qs(
-                expected_url, 'access_policy_types', ['Policy 2']);
+                expected_url, 'information_types', ['Policy 2']);
             Y.Assert.areEqual(expected_url, mockio.last_request.config.data);
             mockio.last_request.successJSON({
                 'resource_type_link': 'entity',

=== modified file 'lib/lp/registry/model/accesspolicy.py'
--- lib/lp/registry/model/accesspolicy.py	2012-03-07 01:24:33 +0000
+++ lib/lp/registry/model/accesspolicy.py	2012-03-08 16:34:46 +0000
@@ -222,6 +222,11 @@
         ids = [policy.id for policy in policies]
         return IStore(cls).find(cls, cls.policy_id.is_in(ids))
 
+    @classmethod
+    def deleteByArtifact(cls, artifacts):
+        """See `IAccessPolicyArtifactSource`."""
+        cls.findByArtifact(artifacts).remove()
+
 
 class AccessArtifactGrant(StormBase):
     implements(IAccessArtifactGrant)
@@ -330,3 +335,13 @@
         ids = [policy.id for policy in policies]
         return IStore(cls).find(
             Person, Person.id == cls.grantee_id, cls.policy_id.is_in(ids))
+
+    @classmethod
+    def findArtifactsByGrantee(cls, grantee, policies):
+        """See `IAccessPolicyGrantFlatSource`."""
+        ids = [policy.id for policy in policies]
+        return IStore(cls).find(
+            AccessArtifact,
+            AccessArtifact.id == cls.abstract_artifact_id,
+            cls.grantee_id == grantee.id,
+            cls.policy_id.is_in(ids))

=== modified file 'lib/lp/registry/services/accesspolicyservice.py'
--- lib/lp/registry/services/accesspolicyservice.py	2012-03-07 01:24:33 +0000
+++ lib/lp/registry/services/accesspolicyservice.py	2012-03-08 16:34:46 +0000
@@ -19,7 +19,9 @@
     SharingPermission,
     )
 from lp.registry.interfaces.accesspolicy import (
+    IAccessArtifactGrantSource,
     IAccessPolicySource,
+    IAccessPolicyGrantFlatSource,
     IAccessPolicyGrantSource,
     )
 from lp.registry.interfaces.accesspolicyservice import IAccessPolicyService
@@ -29,7 +31,7 @@
 
 
 class AccessPolicyService:
-    """Service providing operations for access policies.
+    """Service providing operations for adding and removing pillar observers.
 
     Service is accessed via a url of the form
     '/services/accesspolicy?ws.op=...
@@ -42,27 +44,27 @@
         """See `IService`."""
         return 'accesspolicy'
 
-    def getAccessPolicies(self, pillar):
+    def getInformationTypes(self, pillar):
         """See `IAccessPolicyService`."""
-        allowed_policy_types = [
+        allowed_types = [
             InformationType.EMBARGOEDSECURITY,
             InformationType.USERDATA]
         # Products with current commercial subscriptions are also allowed to
-        # have a PROPRIETARY access policy.
+        # have a PROPRIETARY information type.
         if (IProduct.providedBy(pillar) and
                 pillar.has_current_commercial_subscription):
-            allowed_policy_types.append(InformationType.PROPRIETARY)
+            allowed_types.append(InformationType.PROPRIETARY)
 
-        policies_data = []
-        for x, policy in enumerate(allowed_policy_types):
+        result_data = []
+        for x, policy in enumerate(allowed_types):
             item = dict(
                 index=x,
                 value=policy.name,
                 title=policy.title,
                 description=policy.description
             )
-            policies_data.append(item)
-        return policies_data
+            result_data.append(item)
+        return result_data
 
     def getSharingPermissions(self):
         """See `IAccessPolicyService`."""
@@ -96,31 +98,31 @@
                 person_data = resource.toDataForJSON()
                 person_data['permissions'] = {}
                 person_by_id[policy_grant.grantee.id] = person_data
+                result.append(person_data)
             person_data = person_by_id[policy_grant.grantee.id]
             person_data['permissions'][policy_grant.policy.type.name] = (
                 SharingPermission.ALL.name)
-            result.append(person_data)
         return result
 
     @available_with_permission('launchpad.Edit', 'pillar')
-    def updatePillarObserver(self, pillar, observer, access_policy_types,
+    def updatePillarObserver(self, pillar, observer, information_types,
                              user):
         """See `IAccessPolicyService`."""
 
         # We do not support adding observers to project groups.
         assert not IProjectGroup.providedBy(pillar)
 
-        pillar_policy_types = [
-            (pillar, access_policy_type)
-            for access_policy_type in access_policy_types]
+        pillar_info_types = [
+            (pillar, information_type)
+            for information_type in information_types]
 
         # Create any missing pillar access policies.
         policy_source = getUtility(IAccessPolicySource)
-        pillar_policies = list(policy_source.find(pillar_policy_types))
+        pillar_policies = list(policy_source.find(pillar_info_types))
         existing_policy_types = [
             (pillar, pillar_policy.type) for pillar_policy in pillar_policies]
         required_policies = (
-            set(pillar_policy_types).difference(existing_policy_types))
+            set(pillar_info_types).difference(existing_policy_types))
         if len(required_policies) > 0:
             pillar_policies.extend(policy_source.create(required_policies))
 
@@ -154,13 +156,38 @@
         resource = EntryResource(observer, request)
         person_data = resource.toDataForJSON()
         permissions = {}
-        for access_policy_type in access_policy_types:
-            permissions[access_policy_type.name] = SharingPermission.ALL.name
+        for information_type in information_types:
+            permissions[information_type.name] = SharingPermission.ALL.name
         person_data['permissions'] = permissions
         return person_data
 
     @available_with_permission('launchpad.Edit', 'pillar')
-    def deletePillarObserver(self, pillar, observer, access_policy_type):
+    def deletePillarObserver(self, pillar, observer,
+                             information_types=None):
         """See `IAccessPolicyService`."""
-        # TODO - implement this
-        pass
+
+        policy_source = getUtility(IAccessPolicySource)
+        if information_types is None:
+            # We delete all policy grants for the pillar.
+            pillar_policies = policy_source.findByPillar([pillar])
+        else:
+            # We delete selected policy grants for the pillar.
+            pillar_policy_types = [
+                (pillar, information_type)
+                for information_type in information_types]
+            pillar_policies = list(policy_source.find(pillar_policy_types))
+
+        # First delete any access policy grants.
+        policy_grant_source = getUtility(IAccessPolicyGrantSource)
+        policy_grants = [(policy, observer) for policy in pillar_policies]
+        grants = [
+            (grant.policy, grant.grantee)
+            for grant in policy_grant_source.find(policy_grants)]
+        policy_grant_source.revoke(grants)
+
+        # Second delete any access artifact grants.
+        ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
+        to_delete = ap_grant_flat.findArtifactsByGrantee(
+            observer, pillar_policies)
+        accessartifact_grant_source = getUtility(IAccessArtifactGrantSource)
+        accessartifact_grant_source.revokeByArtifact(to_delete)

=== modified file 'lib/lp/registry/services/tests/test_accesspolicyservice.py'
--- lib/lp/registry/services/tests/test_accesspolicyservice.py	2012-03-07 01:24:33 +0000
+++ lib/lp/registry/services/tests/test_accesspolicyservice.py	2012-03-08 16:34:46 +0000
@@ -57,8 +57,8 @@
         observer_data['permissions'] = permissions
         return observer_data
 
-    def _test_getAccessPolicies(self, pillar, expected_policies):
-        policy_data = self.service.getAccessPolicies(pillar)
+    def _test_getInformationTypes(self, pillar, expected_policies):
+        policy_data = self.service.getInformationTypes(pillar)
         expected_data = []
         for x, policy in enumerate(expected_policies):
             item = dict(
@@ -70,31 +70,31 @@
             expected_data.append(item)
         self.assertContentEqual(expected_data, policy_data)
 
-    def test_getAccessPolicies_product(self):
+    def test_getInformationTypes_product(self):
         product = self.factory.makeProduct()
-        self._test_getAccessPolicies(
+        self._test_getInformationTypes(
             product,
             [InformationType.EMBARGOEDSECURITY, InformationType.USERDATA])
 
-    def test_getAccessPolicies_expired_commercial_product(self):
+    def test_getInformationTypes_expired_commercial_product(self):
         product = self.factory.makeProduct()
         self.factory.makeCommercialSubscription(product, expired=True)
-        self._test_getAccessPolicies(
+        self._test_getInformationTypes(
             product,
             [InformationType.EMBARGOEDSECURITY, InformationType.USERDATA])
 
-    def test_getAccessPolicies_commercial_product(self):
+    def test_getInformationTypes_commercial_product(self):
         product = self.factory.makeProduct()
         self.factory.makeCommercialSubscription(product)
-        self._test_getAccessPolicies(
+        self._test_getInformationTypes(
             product,
             [InformationType.EMBARGOEDSECURITY,
              InformationType.USERDATA,
              InformationType.PROPRIETARY])
 
-    def test_getAccessPolicies_distro(self):
+    def test_getInformationTypes_distro(self):
         distro = self.factory.makeDistribution()
-        self._test_getAccessPolicies(
+        self._test_getInformationTypes(
             distro,
             [InformationType.EMBARGOEDSECURITY, InformationType.USERDATA])
 
@@ -164,21 +164,21 @@
             policy, grantee=observer, grantor=grantor)
 
         # Now call updatePillarObserver will the grants we want.
-        access_policy_types = [
+        information_types = [
             InformationType.EMBARGOEDSECURITY,
             InformationType.USERDATA]
         observer_data = self.service.updatePillarObserver(
-            pillar, observer, access_policy_types, grantor)
+            pillar, observer, information_types, grantor)
         policies = getUtility(IAccessPolicySource).findByPillar([pillar])
         policy_grant_source = getUtility(IAccessPolicyGrantSource)
         grants = policy_grant_source.findByPolicy(policies)
-        self.assertEqual(grants.count(), len(access_policy_types))
+        self.assertEqual(grants.count(), len(information_types))
         for grant in grants:
             self.assertEqual(grantor, grant.grantor)
             self.assertEqual(observer, grant.grantee)
-            self.assertIn(grant.policy.type, access_policy_types)
+            self.assertIn(grant.policy.type, information_types)
         expected_observer_data = self._makeObserverData(
-            observer, access_policy_types)
+            observer, information_types)
         self.assertEqual(expected_observer_data, observer_data)
 
     def test_updateProjectGroupObserver_not_allowed(self):
@@ -209,11 +209,10 @@
         # updatePillarObserver raises an Unauthorized exception if the user is
         # not permitted to do so.
         observer = self.factory.makePerson()
-        access_policy_type = InformationType.USERDATA
         user = self.factory.makePerson()
         self.assertRaises(
             Unauthorized, self.service.updatePillarObserver,
-            pillar, observer, [access_policy_type], user)
+            pillar, observer, [InformationType.USERDATA], user)
 
     def test_updatePillarObserverAnonymous(self):
         # Anonymous users are not allowed.
@@ -227,6 +226,77 @@
         login_person(self.factory.makePerson())
         self._test_updatePillarObserverUnauthorized(product)
 
+    def _test_deletePillarObserver(self, pillar, types_to_delete=None):
+        # Make grants for some information types.
+        information_types = [
+            InformationType.EMBARGOEDSECURITY,
+            InformationType.USERDATA]
+        access_policies = []
+        for info_type in information_types:
+            access_policy = self.factory.makeAccessPolicy(
+                pillar=pillar, type=info_type)
+            access_policies.append(access_policy)
+        grantee = self.factory.makePerson()
+        # Make some access policy grants for our observer.
+        for access_policy in access_policies:
+            self.factory.makeAccessPolicyGrant(access_policy, grantee)
+        # Make some artifact grants for our observer.
+        artifact = self.factory.makeAccessArtifact()
+        self.factory.makeAccessArtifactGrant(artifact, grantee)
+        for access_policy in access_policies:
+            self.factory.makeAccessPolicyArtifact(
+                artifact=artifact, policy=access_policy)
+        # Make some access policy grants for another observer.
+        another = self.factory.makePerson()
+        self.factory.makeAccessPolicyGrant(access_policies[0], another)
+        # Delete data for a specific information type.
+        self.service.deletePillarObserver(pillar, grantee, types_to_delete)
+        # Assemble the expected data for the remaining access grants for
+        # grantee.
+        expected_data = []
+        if types_to_delete is not None:
+            expected_information_types = (
+                set(information_types).difference(types_to_delete))
+            remaining_grantee_person_data = self._makeObserverData(
+                grantee, expected_information_types)
+            expected_data.append(remaining_grantee_person_data)
+        # Add the data for the other observer.
+        another_person_data = self._makeObserverData(
+            another, information_types[:1])
+        expected_data.append(another_person_data)
+        self.assertContentEqual(
+            expected_data, self.service.getPillarObservers(pillar))
+
+    def test_deleteProductObserverAll(self):
+        # Users with launchpad.Edit can delete all access for an observer.
+        owner = self.factory.makePerson()
+        product = self.factory.makeProduct(owner=owner)
+        login_person(owner)
+        self._test_deletePillarObserver(product)
+
+    def test_deleteProductObserverPolicies(self):
+        # Users with launchpad.Edit can delete selected policy access for an
+        # observer.
+        owner = self.factory.makePerson()
+        product = self.factory.makeProduct(owner=owner)
+        login_person(owner)
+        self._test_deletePillarObserver(product, [InformationType.USERDATA])
+
+    def test_deleteDistroObserverAll(self):
+        # Users with launchpad.Edit can delete all access for an observer.
+        owner = self.factory.makePerson()
+        distro = self.factory.makeDistribution(owner=owner)
+        login_person(owner)
+        self._test_deletePillarObserver(distro)
+
+    def test_deleteDistroObserverPolicies(self):
+        # Users with launchpad.Edit can delete selected policy access for an
+        # observer.
+        owner = self.factory.makePerson()
+        distro = self.factory.makeDistribution(owner=owner)
+        login_person(owner)
+        self._test_deletePillarObserver(distro, [InformationType.USERDATA])
+
 
 class ApiTestMixin:
     """Common tests for launchpadlib and webservice."""

=== modified file 'lib/lp/registry/tests/test_accesspolicy.py'
--- lib/lp/registry/tests/test_accesspolicy.py	2012-03-07 01:24:33 +0000
+++ lib/lp/registry/tests/test_accesspolicy.py	2012-03-08 16:34:46 +0000
@@ -264,6 +264,16 @@
             grants,
             getUtility(IAccessArtifactGrantSource).findByArtifact([artifact]))
 
+    def test_revokeByArtifact(self):
+        # revokeByArtifact() removes the relevant grants.
+        artifact = self.factory.makeAccessArtifact()
+        grant = self.factory.makeAccessArtifactGrant(artifact=artifact)
+        other_grant = self.factory.makeAccessArtifactGrant()
+        getUtility(IAccessArtifactGrantSource).revokeByArtifact([artifact])
+        IStore(grant).invalidate()
+        self.assertRaises(LostObjectError, getattr, grant, 'grantor')
+        self.assertIsNot(None, other_grant.grantor)
+
 
 class TestAccessPolicyArtifact(TestCaseWithFactory):
     layer = DatabaseFunctionalLayer
@@ -319,6 +329,21 @@
             links,
             getUtility(IAccessPolicyArtifactSource).findByPolicy([policy]))
 
+    def test_deleteByArtifact(self):
+        # deleteByArtifact() removes the relevant grants.
+        grant = self.factory.makeAccessPolicyArtifact()
+        other_grant = self.factory.makeAccessPolicyArtifact()
+        getUtility(IAccessPolicyArtifactSource).deleteByArtifact(
+            [grant.abstract_artifact])
+        self.assertContentEqual(
+            [],
+            getUtility(IAccessPolicyArtifactSource).findByArtifact(
+                [grant.abstract_artifact]))
+        self.assertContentEqual(
+            [other_grant],
+            getUtility(IAccessPolicyArtifactSource).findByArtifact(
+                [other_grant.abstract_artifact]))
+
 
 class TestAccessPolicyGrant(TestCaseWithFactory):
     layer = DatabaseFunctionalLayer
@@ -414,3 +439,19 @@
         self.assertContentEqual(
             [policy_grant.grantee, artifact_grant.grantee],
             apgfs.findGranteesByPolicy([policy]))
+
+    def test_findArtifactsByGrantee(self):
+        # findArtifactsByGrantee() returns the artifacts for grantee for any of
+        # the policies.
+        apgfs = getUtility(IAccessPolicyGrantFlatSource)
+        policy = self.factory.makeAccessPolicy()
+        grantee = self.factory.makePerson()
+        # Artifacts not linked to the policy do not show up.
+        artifact = self.factory.makeAccessArtifact()
+        self.factory.makeAccessArtifactGrant(artifact, grantee)
+        self.assertContentEqual(
+            [], apgfs.findArtifactsByGrantee(grantee, [policy]))
+        # Artifacts linked to the policy do show up.
+        self.factory.makeAccessPolicyArtifact(artifact=artifact, policy=policy)
+        self.assertContentEqual(
+            [artifact], apgfs.findArtifactsByGrantee(grantee, [policy]))

=== modified file 'lib/lp/scripts/garbo.py'
--- lib/lp/scripts/garbo.py	2012-03-07 07:29:31 +0000
+++ lib/lp/scripts/garbo.py	2012-03-08 16:34:46 +0000
@@ -13,6 +13,7 @@
     datetime,
     timedelta,
     )
+import itertools
 import logging
 import multiprocessing
 import os
@@ -26,7 +27,12 @@
 import iso8601
 from psycopg2 import IntegrityError
 import pytz
-from storm.expr import In
+from storm.expr import (
+    Exists,
+    In,
+    Not,
+    Select,
+    )
 from storm.locals import (
     Max,
     Min,
@@ -57,7 +63,12 @@
     RevisionCache,
     )
 from lp.hardwaredb.model.hwdb import HWSubmission
+from lp.registry.enums import InformationType
+from lp.registry.interfaces.accesspolicy import IAccessPolicySource
+from lp.registry.model.accesspolicy import AccessPolicy
+from lp.registry.model.distribution import Distribution
 from lp.registry.model.person import Person
+from lp.registry.model.product import Product
 from lp.services.config import config
 from lp.services.database import postgresql
 from lp.services.database.constants import UTC_NOW
@@ -990,6 +1001,64 @@
         transaction.commit()
 
 
+class AccessPolicyDistributionAddition(TunableLoop):
+    """A `TunableLoop` to add AccessPolicy for all distributions."""
+
+    maximum_chunk_size = 5000
+
+    def __init__(self, log, abort_time=None):
+        super(AccessPolicyDistributionAddition, self).__init__(
+            log, abort_time)
+        self.transaction = transaction
+        self.store = IMasterStore(Distribution)
+
+    def findDistributions(self):
+        return self.store.find(
+            Distribution,
+            Not(Exists(
+                Select(AccessPolicy.id,
+                tables=[AccessPolicy], where=[
+                    AccessPolicy.distribution_id == Distribution.id]))))
+
+    def isDone(self):
+        return self.findDistributions().is_empty()
+
+    def __call__(self, chunk_size):
+        policies = itertools.product(
+            self.findDistributions()[:chunk_size],
+            (InformationType.USERDATA, InformationType.EMBARGOEDSECURITY))
+        getUtility(IAccessPolicySource).create(policies)
+        self.transaction.commit()
+
+
+class AccessPolicyProductAddition(TunableLoop):
+    """A `TunableLoop` to add AccessPolicy for all products."""
+
+    maximum_chunk_size = 5000
+
+    def __init__(self, log, abort_time=None):
+        super(AccessPolicyProductAddition, self).__init__(log, abort_time)
+        self.transaction = transaction
+        self.store = IMasterStore(Product)
+
+    def findProducts(self):
+        return self.store.find(
+            Product,
+            Not(Exists(
+                Select(AccessPolicy.id, tables=[AccessPolicy], where=[
+                    AccessPolicy.product_id == Product.id]))))
+
+    def isDone(self):
+        return self.findProducts().is_empty()
+
+    def __call__(self, chunk_size):
+        policies = itertools.product(
+            self.findProducts()[:chunk_size],
+            (InformationType.USERDATA, InformationType.EMBARGOEDSECURITY))
+        getUtility(IAccessPolicySource).create(policies)
+        self.transaction.commit()
+
+
 class SpecificationWorkitemMigrator(TunableLoop):
     """Migrate work-items from Specification.whiteboard to
     SpecificationWorkItem.
@@ -1315,6 +1384,8 @@
         UnusedSessionPruner,
         DuplicateSessionPruner,
         BugHeatUpdater,
+        AccessPolicyDistributionAddition,
+        AccessPolicyProductAddition,
         ]
     experimental_tunable_loops = []
 

=== modified file 'lib/lp/scripts/tests/test_garbo.py'
--- lib/lp/scripts/tests/test_garbo.py	2012-03-07 07:29:31 +0000
+++ lib/lp/scripts/tests/test_garbo.py	2012-03-08 16:34:46 +0000
@@ -54,6 +54,8 @@
     )
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportresult import CodeImportResult
+from lp.registry.enums import InformationType
+from lp.registry.interfaces.accesspolicy import IAccessPolicySource
 from lp.registry.interfaces.person import IPersonSet
 from lp.scripts.garbo import (
     AntiqueSessionPruner,
@@ -1019,6 +1021,26 @@
         self.runHourly()
         self.assertNotEqual(old_update, bug.heat_last_updated)
 
+    def test_AccessPolicyDistributionAddition(self):
+        switch_dbuser('testadmin')
+        distribution = self.factory.makeDistribution()
+        transaction.commit()
+        self.runHourly()
+        ap = getUtility(IAccessPolicySource).findByPillar((distribution,))
+        expected = [
+            InformationType.USERDATA, InformationType.EMBARGOEDSECURITY]
+        self.assertContentEqual(expected, [policy.type for policy in ap])
+
+    def test_AccessPolicyProductAddition(self):
+        switch_dbuser('testadmin')
+        product = self.factory.makeProduct()
+        transaction.commit()
+        self.runHourly()
+        ap = getUtility(IAccessPolicySource).findByPillar((product,))
+        expected = [
+            InformationType.USERDATA, InformationType.EMBARGOEDSECURITY]
+        self.assertContentEqual(expected, [policy.type for policy in ap])
+
     def test_SpecificationWorkitemMigrator_not_enabled_by_default(self):
         self.assertFalse(getFeatureFlag('garbo.workitem_migrator.enabled'))
         switch_dbuser('testadmin')

=== modified file 'lib/lp/services/webapp/adapter.py'
--- lib/lp/services/webapp/adapter.py	2011-12-30 08:13:14 +0000
+++ lib/lp/services/webapp/adapter.py	2012-03-08 16:34:46 +0000
@@ -226,11 +226,11 @@
     timeline = get_request_timeline(request)
     from lp.services.webapp.errorlog import (
         maybe_record_user_requested_oops)
-    oopsid = maybe_record_user_requested_oops()
-    if oopsid is None:
+    maybe_record_user_requested_oops()
+    if request.oopsid is None:
         oops_str = ""
     else:
-        oops_str = " %s" % oopsid
+        oops_str = " %s" % request.oopsid
     log = "%s queries/external actions issued in %.2f seconds%s" % (
         len(timeline.actions), secs, oops_str)
     return log

=== modified file 'lib/lp/services/webapp/errorlog.py'
--- lib/lp/services/webapp/errorlog.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/webapp/errorlog.py	2012-03-08 16:34:46 +0000
@@ -542,18 +542,16 @@
 def maybe_record_user_requested_oops():
     """If an OOPS has been requested, report one.
 
-    :return: The oopsid of the requested oops.  Returns None if an oops was
-        not requested, or if there is already an OOPS.
+    It will be stored in request.oopsid.
     """
     request = get_current_browser_request()
-    # If there is no request, or there is an oops already, then return.
-    if (request is None or
-        request.oopsid is not None or
-        not request.annotations.get(LAZR_OOPS_USER_REQUESTED_KEY, False)):
-        return None
-    globalErrorUtility.raising(
-        (UserRequestOops, UserRequestOops(), None), request)
-    return request.oopsid
+    # If there's a request and no existing OOPS, but an OOPS has been
+    # requested, record one.
+    if (request is not None
+        and request.oopsid is None
+        and request.annotations.get(LAZR_OOPS_USER_REQUESTED_KEY, False)):
+        globalErrorUtility.raising(
+            (UserRequestOops, UserRequestOops(), None), request)
 
 
 class OopsNamespace(view):

=== modified file 'lib/lp/services/webapp/tests/test_user_requested_oops.py'
--- lib/lp/services/webapp/tests/test_user_requested_oops.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/webapp/tests/test_user_requested_oops.py	2012-03-08 16:34:46 +0000
@@ -37,20 +37,28 @@
     def test_none_requested(self):
         # If an oops was not requested, then maybe_record_user_requested_oops
         # does not record an oops.
-        oops_id = maybe_record_user_requested_oops()
-        self.assertIs(None, oops_id)
         request = get_current_browser_request()
+        maybe_record_user_requested_oops()
         self.assertIs(None, request.oopsid)
 
     def test_annotation_key(self):
-        # The request for an oops is stored in the request annotations.  If a
-        # user request oops is recorded, the oops id is returned, and also
-        # stored in the request.
-        request = get_current_browser_request()
-        request.annotations[LAZR_OOPS_USER_REQUESTED_KEY] = True
-        oops_id = maybe_record_user_requested_oops()
-        self.assertIsNot(None, oops_id)
-        self.assertEqual(oops_id, request.oopsid)
+        # The request for an oops is stored in the request annotations.
+        # If a user request oops is recorded, the oops id is stored in
+        # the request.
+        request = get_current_browser_request()
+        request.annotations[LAZR_OOPS_USER_REQUESTED_KEY] = True
+        self.assertIs(None, request.oopsid)
+        maybe_record_user_requested_oops()
+        self.assertIsNot(None, request.oopsid)
+
+    def test_multiple_calls(self):
+        # Asking to record the OOPS twice just returns the same ID.
+        request = get_current_browser_request()
+        request.annotations[LAZR_OOPS_USER_REQUESTED_KEY] = True
+        maybe_record_user_requested_oops()
+        orig_oops_id = request.oopsid
+        maybe_record_user_requested_oops()
+        self.assertEqual(orig_oops_id, request.oopsid)
 
     def test_existing_oops_stops_user_requested(self):
         # If there is already an existing oops id in the request, then the
@@ -58,8 +66,7 @@
         request = get_current_browser_request()
         request.oopsid = "EXISTING"
         request.annotations[LAZR_OOPS_USER_REQUESTED_KEY] = True
-        oops_id = maybe_record_user_requested_oops()
-        self.assertIs(None, oops_id)
+        maybe_record_user_requested_oops()
         self.assertEqual("EXISTING", request.oopsid)
 
     def test_OopsNamespace_traverse(self):

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builder-page.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2012-01-15 11:06:57 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2012-03-08 16:34:46 +0000
@@ -4,6 +4,7 @@
 builder state. In the sampledata, the builder 'bob' is building
 'mozilla-firefox'.
 
+    >>> anon_browser.mech_browser.set_handle_equiv(False)
     >>> anon_browser.open("http://launchpad.dev/builders")
     >>> anon_browser.getLink("bob").click()
 
@@ -27,6 +28,7 @@
 timezone. This way they can easily find out if they are reading
 outdated information.
 
+    >>> user_browser.mech_browser.set_handle_equiv(False)
     >>> user_browser.open(anon_browser.url)
     >>> print extract_text(find_portlet(
     ...     user_browser.contents, 'View full history Current status'))
@@ -68,6 +70,7 @@
 
     >>> cprov_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
+    >>> cprov_browser.mech_browser.set_handle_equiv(False)
 
     >>> cprov_browser.open('http://launchpad.dev/builders')
     >>> cprov_browser.getLink('bob').click()
@@ -193,7 +196,7 @@
 when they judge it convenient, for instance, when the builder present
 transient failures or is used for another purpose.
 
-    >>> cprov_browser.open('http://launchpad.dev/+builds')
+    >>> cprov_browser.open('http://launchpad.dev/builders')
     >>> cprov_browser.getLink('bob').click()
     >>> print backslashreplace(cprov_browser.title)
     Bob The Builder : Build Farm

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2011-12-23 23:44:59 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2012-03-08 16:34:46 +0000
@@ -4,6 +4,7 @@
 link to it yet because we are not yet sure of the benefits of doing
 this, since the audience of this page is still restricted.
 
+    >>> anon_browser.mech_browser.set_handle_equiv(False)
     >>> anon_browser.open('http://launchpad.dev/+builds')
 
 The BuildFarm contains a list of all builders registered in Launchpad
@@ -120,6 +121,7 @@
 
 Administrators can create new builders.
 
+    >>> admin_browser.mech_browser.set_handle_equiv(False)
     >>> admin_browser.open("http://launchpad.dev/+builds/+index")
 
     >>> admin_browser.getLink("Register a new build machine").click()

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2012-01-06 11:08:30 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2012-03-08 16:34:46 +0000
@@ -69,7 +69,8 @@
 
 For Builder, same as Distribution:
 
-    >>> anon_browser.open("http://launchpad.dev/+builds/bob")
+    >>> anon_browser.mech_browser.set_handle_equiv(False)
+    >>> anon_browser.open("http://launchpad.dev/builders/bob")
     >>> anon_browser.getLink("View full history").click()
     >>> print anon_browser.title
     Build history : Bob The Builder : Build Farm

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-private-builds.txt'
--- lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2012-01-15 11:06:57 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2012-03-08 16:34:46 +0000
@@ -65,6 +65,7 @@
 The status shown to an anonymous user hides the private source it is
 building.
 
+    >>> anon_browser.mech_browser.set_handle_equiv(False)
     >>> anon_browser.open("http://launchpad.dev/+builds/frog")
     >>> print extract_text(find_main_content(anon_browser.contents))
     The frog builder...
@@ -74,6 +75,7 @@
 
 Launchpad Administrators are allowed to see the build:
 
+    >>> admin_browser.mech_browser.set_handle_equiv(False)
     >>> admin_browser.open("http://launchpad.dev/+builds/frog")
     >>> print extract_text(find_main_content(admin_browser.contents))
     The frog builder...
@@ -85,6 +87,7 @@
 Buildd Administrators are not allowed to see the build in the portlet:
 
     >>> name12_browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> name12_browser.mech_browser.set_handle_equiv(False)
     >>> name12_browser.open("http://launchpad.dev/+builds/frog")
     >>> print extract_text(find_main_content(name12_browser.contents))
     The frog builder...
@@ -96,6 +99,7 @@
 
     >>> cprov_browser = setupBrowser(
     ...     auth="Basic [e-mail]:test")
+    >>> cprov_browser.mech_browser.set_handle_equiv(False)
     >>> cprov_browser.open("http://launchpad.dev/+builds/frog")
     >>> print extract_text(find_main_content(cprov_browser.contents))
     The frog builder...
@@ -295,7 +299,6 @@
 
 Now the anonymous user can see the build:
 
-    >>> anon_browser = setupBrowser()
     >>> anon_browser.open("http://launchpad.dev/+builds")
     >>> print extract_text(find_main_content(anon_browser.contents))
     The Launchpad build farm
@@ -307,6 +310,7 @@
 
 Any other logged-in user will also see the build:
 
+    >>> browser.mech_browser.set_handle_equiv(False)
     >>> browser.open("http://launchpad.dev/+builds")
     >>> print extract_text(find_main_content(browser.contents))
     The Launchpad build farm

=== modified file 'lib/lp/translations/stories/buildfarm/xx-build-summary.txt'
--- lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2012-02-09 23:09:36 +0000
+++ lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2012-03-08 16:34:46 +0000
@@ -71,6 +71,7 @@
 The job's summary shows that what type of job this is.  It also links
 to the branch.
 
+    >>> user_browser.mech_browser.set_handle_equiv(False)
     >>> user_browser.open(builder_page)
     >>> print extract_text(find_build_summary(user_browser))
     Working on TranslationTemplatesBuildJob for branch ...

=== modified file 'utilities/setuplxc.py'
--- utilities/setuplxc.py	2012-03-06 00:11:17 +0000
+++ utilities/setuplxc.py	2012-03-08 16:34:46 +0000
@@ -761,13 +761,12 @@
                 LP_SOURCE_DEPS, 'download-cache'])
 
 
-def create_scripts(user, directory, lxcname, ssh_key_path):
+def create_scripts(user, lxcname, ssh_key_path):
     """Create scripts to update the Launchpad environment and run tests."""
     mapping = {
-        'user': user,
         'lxcname': lxcname,
         'ssh_key_path': ssh_key_path,
-        'checkout_dir': os.path.join(directory, LP_CHECKOUT),
+        'user': user,
         }
     # We need a script that will run the LP build inside LXC.  It is run as
     # root (see below) but drops root once inside the LXC container.
@@ -775,12 +774,22 @@
     with open(build_script_file, 'w') as script:
         script.write(textwrap.dedent("""\
             #!/bin/sh
-            set -uex
+            set -ux
             lxc-start -n {lxcname} -d
             lxc-wait -n {lxcname} -s RUNNING
-            sleep 30  # aparently RUNNING isn't quite enough
-            su {user} -c "/usr/bin/ssh -o StrictHostKeyChecking=no \\
-                -i '{ssh_key_path}' {lxcname} make -C $PWD schema"
+            for i in $(seq 1 30); do
+                su {user} -c "/usr/bin/ssh -o StrictHostKeyChecking=no \\
+                    -i '{ssh_key_path}' {lxcname} make -C $PWD schema"
+                if [ ! 255 -eq $? ]; then
+                    # If ssh returns 255 then its connection failed.
+                    # Anything else is either success (status 0) or a
+                    # failure from whatever we ran over the SSH connection.
+                    # In those cases we want to stop looping, so we break
+                    # here.
+                    break;
+                fi
+                sleep 1
+            done
             lxc-stop -n {lxcname}
             lxc-wait -n {lxcname} -s STOPPED
             """.format(**mapping)))
@@ -955,7 +964,7 @@
         ('initialize_host', (
             user, fullname, email, lpuser, private_key, public_key,
             ssh_key_path, dependencies_dir, directory)),
-        ('create_scripts', (user, directory, lxc_name, ssh_key_path)),
+        ('create_scripts', (user, lxc_name, ssh_key_path)),
         ('create_lxc', (user, lxc_name, ssh_key_path)),
         ('initialize_lxc', (
             user, dependencies_dir, directory, lxc_name, ssh_key_path)),