Merge lp:~robru/bileto/finalize into lp:~ci-train-staging-area/bileto/trunk-copy-please-ignore

[Robert Bruce Park]

Testing merges to trunk.

=== modified file 'bileto/actions.py'
--- bileto/actions.py	2016-06-04 00:33:30 +0000
+++ bileto/actions.py	2016-06-16 06:25:31 +0000
@@ -7,6 +7,7 @@
 class Actions:
     """Define what actions can be taken on a ticket."""
     statuses = dict(
+        assign='Assigning PPA...',
         status='Updating status.',
         build='Preparing packages.',
         diff='Generating diffs.',
@@ -16,6 +17,11 @@
     )
 
     @staticmethod
+    def assign(manager):
+        """Assign a PPA to this Ticket"""
+        manager.assign()
+
+    @staticmethod
     def status(manager):
         """Update Package States"""
         manager.status()
@@ -39,9 +45,9 @@
     @staticmethod
     def finalize(manager):
         """Merge to Trunk"""
-        manager.merge().push().nuke()
+        manager.merge().push().nuke('Landed')
 
     @staticmethod
     def abandon(manager):
-        """Delete PPA"""
-        manager.abandon().nuke()
+        """Give Up PPA, Close Ticket"""
+        manager.nuke('Abandoned')
 
=== modified file 'bileto/models.py'
--- bileto/models.py	2016-06-10 21:49:43 +0000
+++ bileto/models.py	2016-06-16 06:25:31 +0000
@@ -114,13 +114,6 @@
 
 Link to a document that explains the steps to verify this silo."""
 
-SUMMARY = """Packages:
-{packages}
-
-More info:
-{REQUEST_URL_ROOT}{permalink}
-"""
-
 COLORS = dict(
     blue={'granted'},
     green={'landed'},
@@ -264,17 +257,6 @@
         if self.series == 'xenial+vivid':
             raise BiletoError(MIGRATE_TO_YAKKETY)
 
-    def summarize(self):
-        """Return a text summary of this ticket."""
-        return SUMMARY.format(
-            packages=N.join(
-                'https://launchpad.net/ubuntu/+source/' + source
-                for source in self.sources_sorted),
-            requestid=self.request_id,
-            permalink=self.path,
-            **environ  # Trailing comma is syntax error in py3.4
-        )
-
     def publishable(self):
         """Identify if this request is appropriate to publish or not."""
         if self.status in HIDDEN:
@@ -378,13 +360,14 @@
             self.artifacts = EMPTY
             self.autopkgtest = EMPTY
 
-    def set_status(self, message):
+    def set_status(self, message, **kwargs):
         """Update status immediately."""
         self.update(
             status=message,
             job_log=environ.get('LOG_PATH') or
             environ.get('REQUEST_PATH') or
-            request.path)
+            request.path,
+            **kwargs)
         self.commit()
         return message
 
@@ -398,12 +381,10 @@
     @lru_cache()
     def lock_fd(self):
         """Return the file descriptor that we lock on."""
-        print(self.lockfile)
         return open(self.lockfile, 'w')
 
     def lock(self):
         """Prevent multiple jobs from running simultaneously."""
-        print(self.lock_fd)
         flock(self.lock_fd, LOCK_EX | LOCK_NB)
 
     # TODO: not needed yet
 
=== modified file 'bileto/static/index.html'
--- bileto/static/index.html	2016-06-14 09:25:57 +0000
+++ bileto/static/index.html	2016-06-16 06:25:31 +0000
@@ -224,12 +224,12 @@
 
 <div class="actionbox" ng-if="req.request_id && expand">
 <table class="actions"><tr>
-<td ng-if="!editing"><a href="{{meta.jenkins}}/securityRealm/commenceLogin?from=/job/prepare-silo/parambuild%3FREQUEST_ID%3D{{req.request_id}}" target="_blank">Assign</a></td>
+<td ng-if="!editing"><a href="/log/{{req.request_id}}/assign" target="_blank">Assign</a></td>
 <td ng-if="req.siloname && !editing"><a href="/log/{{req.request_id}}/build" target="_blank">Build</a></td>
 <td ng-if="req.siloname && !editing"><a href="/log/{{req.request_id}}/diff" target="_blank">Diff</a></td>
 <td ng-if="req.siloname && !editing"><a href="{{meta.jenkins}}/job/{{req.siloname.replace('/', '-')}}-2-publish/build" target="_blank">Publish</a></td>
-<td ng-if="req.siloname && !editing"><a href="{{meta.jenkins}}/job/{{req.siloname.replace('/', '-')}}-3-merge-clean/build" target="_blank">Merge</a></td>
-<td><a href="{{meta.jenkins}}/securityRealm/commenceLogin?from=/job/abandon/parambuild%3FREQUEST_ID%3D{{req.request_id}}" target="_blank">Abandon</a></td>
+<td ng-if="req.siloname && !editing"><a href="/log/{{req.request_id}}/finalize" target="_blank">Finalize</a></td>
+<td><a href="/log/{{req.request_id}}/abandon" target="_blank">Abandon</a></td>
 <td ng-if="editing"><a ng-click="cancel()">Cancel Edit</a></td>
 <td ng-if="!editing"><a ng-click="edit(req)">Edit</a></td>
 </tr></table>
 
=== modified file 'bileto/streams.py'
--- bileto/streams.py	2016-06-14 09:21:38 +0000
+++ bileto/streams.py	2016-06-16 06:25:31 +0000
@@ -78,7 +78,7 @@
 
 def assert_action(action):
     """Abort if action is invalid."""
-    if action not in ('build', 'diff'):
+    if action not in ('assign', 'build', 'diff', 'finalize', 'abandon'):
         abort(404)
 
 
 
=== modified file 'bileto/worker/manager.py'
--- bileto/worker/manager.py	2016-06-14 11:51:01 +0000
+++ bileto/worker/manager.py	2016-06-16 06:25:31 +0000
@@ -11,11 +11,15 @@
 """
 
 from os import environ
+from os.path import join
+
 from contextlib import suppress
 from functools import lru_cache
+from fcntl import flock, LOCK_EX
 from collections import defaultdict
 
-from lazr.restfulclient.errors import BadRequest, NotFound
+from requests import get
+from lazr.restfulclient.errors import NotFound
 
 from bileto.lplib import lp
 from bileto.settings import Config
@@ -25,10 +29,15 @@
 from bileto.worker.gles import GLES
 from bileto.worker.merge import Merge
 from bileto.worker.manual import Manual
-from bileto.worker.vcs import parallelize
+from bileto.worker.vcs import VCS, parallelize
 from bileto.worker.package import Package
 from bileto.worker.secondary import Secondary
 
+API_PREFIX = 'http://127.0.0.1:8080/v1/tickets?'
+READ_API = API_PREFIX + 'active_only&siloname=land'
+
+UNAVAILABLE = """No silos available! Please ask your friendly neighborhood \
+trainguard to free some."""
 MERGE_ORDER = """Merges have been sorted by prerequisite \
 and will be merged in this order:
 %s
@@ -59,6 +68,37 @@
         log.info('Packages targetting %s:\n%s\n', dest, N.join(names))
 
 
+def discover_ppas():
+    """Discover what PPAs we have."""
+    for ppa in lp.ppa_team.ppas:
+        dist = ppa.distribution_link.split('/')[-1]
+        siloname = '{}/{}'.format(dist, ppa.name)
+        if '/landing-' in siloname and '-deleted' not in siloname:
+            yield siloname
+
+
+def choose_available_ppa():
+    """Randomly choose one available PPA for assignment."""
+    silonames = set(discover_ppas())
+    resp = get(READ_API).json()
+    assigned = {ticket['siloname'] for ticket in resp.get('requests', [])}
+    available = silonames - assigned
+    if not available:
+        raise BiletoError(UNAVAILABLE)
+    return available.pop()
+
+
+def set_swift_creds():
+    """Ensure swift creds are set in environment variables."""
+    environ.update(
+        OS_REGION_NAME=Config.os_region_name,
+        OS_TENANT_NAME=Config.os_tenant_name,
+        OS_AUTH_URL=Config.os_auth_url,
+        OS_USERNAME=Config.os_username,
+        OS_PASSWORD=Config.os_password,
+    )
+
+
 class Manager:
     """Manage the instantiation of Package objects."""
     def __init__(self, ticket):
@@ -134,13 +174,28 @@
             """Pass arguments down to methods."""
             log.abort_if_cancelled()
             log.debug('Beginning step: {}'.format(attr.upper()))
-            getattr(Package, 'pre_' + attr, NOP)(self.ticket)
             parallelize([getattr(package, attr)(*args, **kwargs)
                          for name, package in self.packages().items()])
-            getattr(Package, 'post_' + attr, NOP)(self.ticket)
             return self
         return passthrough
 
+    def assign(self):
+        """Assign a PPA to this ticket, if possible."""
+        with open(join(Config.HOME, 'bileto-assign-lock'), 'w') as lock:
+            flock(lock, LOCK_EX)
+            if not self.ticket.siloname:
+                siloname = choose_available_ppa()
+                log.info('This ticket has been assigned %s.', siloname)
+                self.ticket.set_status('Ready to build', siloname=siloname)
+                self.ticket.commit()
+            else:
+                log.info('This ticket is already assigned! Just build it!')
+
+    def validate(self):
+        """Halt job if ticket has invalid parameters."""
+        self.ticket.validate()
+        return self
+
     def upload(self):
         """Prevent cancellation once uploading begins."""
         log.cancellable = False
@@ -152,12 +207,26 @@
         environ.update(INCLUDES=self.ticket.sources)
         for func in (Manager.names, Manager.types, Manager.packages):
             func.cache_clear()
-        return self.__getattr__('diff')()
+        self.__getattr__('diff')()
+        set_swift_creds()
+        stdout = parallelize([VCS.swift_upload()])[0]
+        log.info('Uploaded diffs:\n%s', stdout)
+        self.ticket.artifacts = stdout
+        self.ticket.commit()
 
-    def nuke(self):
-        """Delete PPA."""
-        self.delete_ppa(self.ticket.request_id)
-        # TODO: Delete swift container
+    def nuke(self, status):
+        """Delete PPA contents."""
+        # TODO: Eventually delete ephemeral PPAs here
+        # self.delete_ppa(self.ticket.request_id)
+        with suppress(BiletoError):
+            for source in self.ppa.getPublishedSources():
+                if source.status != 'Deleted':
+                    log.info('Deleting %s ppa.', source.display_name)
+                    source.requestDeletion()
+        set_swift_creds()
+        parallelize([VCS.delete_swift()])
+        self.ticket.set_status(status, siloname=EMPTY, artifacts=EMPTY)
+        self.ticket.commit()
 
     @property
     @lru_cache()
@@ -231,13 +300,14 @@
         # TODO: Needs to be devirted and all arches enabled.
         return self.get_ppa(number)
 
-    def delete_ppa(self, number):
-        """Unconditionally delete an ephemeral PPA."""
-        log.info('Deleting PPA %s.', number)
-        try:
-            self.get_ppa(name_ppa(number)).lp_delete()
-        except BadRequest as err:
-            # Will log 'Archive already deleted.' if deleted but not gone yet
-            log.warning(err.content.decode('utf-8'))
-        except AttributeError:
-            pass  # already gone for real
+    # TODO: use this for ephemeral PPAs eventually
+    # def delete_ppa(self, number):
+    #     """Unconditionally delete an ephemeral PPA."""
+    #     log.info('Deleting PPA %s.', number)
+    #     try:
+    #         self.get_ppa(name_ppa(number)).lp_delete()
+    #     except BadRequest as err:
+    #         # Will log 'Archive already deleted.' if deleted but not gone yet
+    #         log.warning(err.content.decode('utf-8'))
+    #     except AttributeError:
+    #         pass  # already gone for real
 
=== modified file 'bileto/worker/merge.py'
--- bileto/worker/merge.py	2016-06-15 06:14:03 +0000
+++ bileto/worker/merge.py	2016-06-16 06:25:31 +0000
@@ -175,3 +175,14 @@
     def expose(self):
         """Push our locally built branch to launchpad."""
         yield from VCS.expose(self.lp_branch, **self.env)
+
+    @coroutine
+    def merge(self):
+        """Merge target trunk back into our work branch."""
+        yield from VCS.fetch_work_branch(self.lp_branch, **self.env)
+        yield from VCS.merge_trunk(self.target, **self.env)
+
+    @coroutine
+    def push(self):
+        """Push our final release to target trunk."""
+        yield from VCS.push_to_trunk(self.target, **self.env)
 
=== modified file 'bileto/worker/package.py'
--- bileto/worker/package.py	2016-06-13 11:58:39 +0000
+++ bileto/worker/package.py	2016-06-16 06:25:31 +0000
@@ -3,16 +3,16 @@
 Defines steps common to all types of packages that we handle.
 """
 
-from os import environ
 from os.path import join
+from asyncio import coroutine
 from contextlib import suppress
-from asyncio import coroutine, get_event_loop
 
 from bileto.settings import Config
 
-from bileto.worker.log import log
 from bileto.worker.vcs import VCS
 
+EMPTY = ''
+
 
 class Package:
     """Represent the steps necessary to build & publish a package."""
@@ -31,16 +31,6 @@
         self.instances[join(series.name, name)] = self
 
     @coroutine
-    def validate(self):
-        """NOP; Validation handled globally."""
-
-    @staticmethod
-    def post_validate(ticket):
-        """Report ticket summary."""
-        ticket.validate()
-        log.info(ticket.summarize())
-
-    @coroutine
     def build(self):
         """Build source package."""
         yield from VCS.build(**self.env)
@@ -91,25 +81,10 @@
             self.dest.distribution.main_archive))
         yield from VCS.diff_dest(DSC_URL=dest_dsc, **self.env)
 
-    @staticmethod
-    def post_diff(ticket):
-        """Upload all diffs to swift after they are all generated."""
-        environ.update(
-            OS_REGION_NAME=Config.os_region_name,
-            OS_TENANT_NAME=Config.os_tenant_name,
-            OS_AUTH_URL=Config.os_auth_url,
-            OS_USERNAME=Config.os_username,
-            OS_PASSWORD=Config.os_password,
-        )
-        stdout = get_event_loop().run_until_complete(VCS.swift_upload(
-            # Don't put creds here as they'll leak into debug logs.
-            REQUESTID=str(ticket.request_id),
-        ))
-        log.info('Uploaded diffs:\n%s', stdout)
-        ticket.artifacts = stdout
-        ticket.commit()
+    @coroutine
+    def merge(self):
+        """NOP; implemented by subclasses."""
 
-    @staticmethod
-    def post_abandon(ticket):
-        """Deactivate ticket."""
-        ticket.set_status('Abandoned')
+    @coroutine
+    def push(self):
+        """NOP; implemented by subclasses."""
 
=== modified file 'bileto/worker/vcs.py'
--- bileto/worker/vcs.py	2016-06-14 09:23:00 +0000
+++ bileto/worker/vcs.py	2016-06-16 06:25:31 +0000
@@ -17,7 +17,7 @@
 
 def parallelize(tasks):
     """Do each task in parallel with asyncio."""
-    get_event_loop().run_until_complete(gather(*tasks))
+    return get_event_loop().run_until_complete(gather(*tasks))
 
 
 class VCSError(BiletoError):
 
=== modified file 'debian/control'
--- debian/control	2015-12-13 01:11:10 +0000
+++ debian/control	2016-06-16 06:25:31 +0000
@@ -15,6 +15,7 @@
                python3-nose2,
                python3-pep8,
                python3-pyflakes | pyflakes,
+               python3-requests,
                python3-sqlalchemy,
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/bileto
 
=== modified file 'scripts/vcs.sh'
--- scripts/vcs.sh	2016-06-13 11:39:56 +0000
+++ scripts/vcs.sh	2016-06-16 06:25:31 +0000
@@ -20,6 +20,7 @@
 WORKSPACE="$(pwd)"
 WORKPARENT="$WORKSPACE/$SERIES/$SOURCE"
 WORKDIR="$WORKPARENT/$SOURCE"
+SWIFT_CONTAINER="bileto-$REQUESTID"
 [ -d "$WORKDIR" ] && cd "$WORKDIR" || true
 IFS='
 '
@@ -210,22 +211,24 @@
     root="https://objectstorage.prodstack4-5.canonical.com/v1"
     auth="$(swift stat -v | sed -n 's/^\s\+Account:\s\+//p')"
     timestamp="$(date --utc '+%Y-%m-%d_%H:%M:%S')"
-    container="bileto-$REQUESTID"
     [ -n "$auth" ] || die "Failed to determine swift account. $retry"
 
     diffs=""
     for filename in */*/*.diff; do
         base="$(basename "$filename")"
-        confirmed="$(swift upload "$container" "$filename" --object-name="$timestamp/$base")" || die "Failed to upload diffs. $retry"
+        confirmed="$(swift upload "$SWIFT_CONTAINER" "$filename" --object-name="$timestamp/$base")" || die "Failed to upload diffs. $retry"
         size="$(wc --lines $filename | awk '{ print $1 }')"
-        diffs="$diffs\n$root/$auth/$container/$confirmed ($size lines)"
+        diffs="$diffs\n$root/$auth/$SWIFT_CONTAINER/$confirmed ($size lines)"
     done
 
-    swift post "$container" --read-acl '.r:*,.rlistings' || die "Failed to publish diffs publicly. $retry"
+    swift post "$SWIFT_CONTAINER" --read-acl '.r:*,.rlistings' || die "Failed to publish diffs publicly. $retry"
     # shellcheck disable=SC2059
     printf "$diffs"
 }
 
+do_delete_swift() {
+    loudly swift delete "$SWIFT_CONTAINER" || true
+}
 
 ################
 # BZR Commands #
@@ -289,6 +292,19 @@
     loudly bzr push "$BRANCH" --overwrite || die "Failed to push source tree to launchpad."
 }
 
+bzr_do_fetch_work_branch() {
+    loudly bzr branch "$BRANCH" "$WORKDIR"
+}
+
+bzr_do_merge_trunk() {
+    loudly bzr merge "$CACHE" || die "Failed to merge $BRANCH."
+    loudly bzr commit -m 'Resync trunk.' || true
+}
+
+bzr_do_push_to_trunk() {
+    loudly bzr push "$BRANCH" || die "Failed to push to $BRANCH. Check bot team membership and branch ownership."
+}
+
 
 ################
 # GIT Commands #
 
=== modified file 'tests/test_actions.py'
--- tests/test_actions.py	2016-04-14 21:39:20 +0000
+++ tests/test_actions.py	2016-06-16 06:25:31 +0000
@@ -13,6 +13,14 @@
 class MainTestCase(WorkerTestCase):
     """Test Main Subprocess Script."""
 
+    def test_actions_assign(self):
+        """Ensure assign calls correct methods."""
+        manager = Mock()
+        Actions.assign(manager)
+        self.assertSequenceEqual(manager.mock_calls, [
+            call.assign(),
+        ])
+
     def test_actions_status(self):
         """Ensure status calls correct methods."""
         manager = Mock()
@@ -51,7 +59,7 @@
         self.assertSequenceEqual(manager.mock_calls, [
             call.merge(),
             call.merge().push(),
-            call.merge().push().nuke(),
+            call.merge().push().nuke('Landed'),
         ])
 
     def test_actions_abandon(self):
@@ -59,6 +67,5 @@
         manager = Mock()
         Actions.abandon(manager)
         self.assertSequenceEqual(manager.mock_calls, [
-            call.abandon(),
-            call.abandon().nuke(),
+            call.nuke('Abandoned'),
         ])
 
=== modified file 'tests/test_login.py'
--- tests/test_login.py	2016-02-16 21:33:16 +0000
+++ tests/test_login.py	2016-06-16 06:25:31 +0000
@@ -21,7 +21,7 @@
             openid='test',
             next='/',
         ), follow_redirects=False)
-        self.assertIn(b'https://login.ubuntu.com/+openid', ret.data)
+        self.assertIn(b'You should be redirected', ret.data)
         self.assertEqual(ret.status_code, 302)
 
     def test_login_get(self):
 
=== modified file 'tests/test_models.py'
--- tests/test_models.py	2016-06-03 21:37:27 +0000
+++ tests/test_models.py	2016-06-16 06:25:31 +0000
@@ -42,26 +42,6 @@
         db.session.add.assert_called_once_with(comment.return_value)
         db.session.commit.assert_called_once_with()
 
-    @patch('bileto.models.environ', ENVIRON)
-    def test_request_summarize(self):
-        """Display a handy summary."""
-        req = Request(
-            dest=EMPTY,
-            landers='jimbo',
-            merge_proposals='http://foo/merge',
-            request_id=5,
-            series='yakkety+xenial+vivid',
-            sources='qtmir qtubuntu',
-        )
-        self.assertEqual(
-            req.summarize(),
-            'Packages:\n'
-            'https://launchpad.net/ubuntu/+source/qtmir\n'
-            'https://launchpad.net/ubuntu/+source/qtubuntu\n\n'
-            'More info:\n'
-            'http://example.com/#/ticket/5\n')
-        self.assertEqual(req.merge_proposals_list, ['http://foo/merge'])
-
     def test_request_validate(self):
         """Prevent invalid requests from being built."""
         req = Request(
 
=== modified file 'tests/test_worker_manager.py'
--- tests/test_worker_manager.py	2016-06-14 06:59:01 +0000
+++ tests/test_worker_manager.py	2016-06-16 06:25:31 +0000
@@ -3,15 +3,18 @@
 Test the package manager class.
 """
 
+from os.path import join
+from subprocess import PIPE
 from asyncio import coroutine
 from collections import defaultdict
 from unittest.mock import Mock, patch, call
 
-from lazr.restfulclient.errors import BadRequest
+# from lazr.restfulclient.errors import BadRequest
 
 from tests.tests import WorkerTestCase, fake_subproc
 
 from bileto.lplib import lp
+from bileto.settings import Config
 from bileto.models import BiletoError
 from bileto.worker.manager import Manager, Merge, Manual, Package
 from bileto.worker.log import log
@@ -20,8 +23,11 @@
 DIFF_ENV = dict(INCLUDES='')
 MAKE_PPA_ENV = dict(REQUEST_URL_ROOT='https://ppa/thing')
 MERGES = fake_subproc(0, [(b'ofono', b'')] * 5)
+POST_DIFF = fake_subproc(0, [(b'swift/diff (9000 lines)', b'')])
+POST_NUKE = fake_subproc(0, [(b'', b'')])
 MOCKS = defaultdict(Mock)
 SLASH = '/'
+EMPTY = ''
 N = '\n'
 
 
@@ -211,10 +217,46 @@
         ticket = Mock()
         manager = Manager(ticket)
         manager.do_the_stuff()
-        package.pre_do_the_stuff.assert_called_once_with(ticket)
-        package.post_do_the_stuff.assert_called_once_with(ticket)
         self.assertEqual(called, [True, True])
 
+    @patch('bileto.worker.manager.get')
+    @patch('bileto.worker.manager.lp')
+    def test_manager_assign(self, lp_mock, get):
+        """Assign silos."""
+        lp_mock.ppa_team.ppas = [Mock(distribution_link='/ubuntu')]
+        lp_mock.ppa_team.ppas[0].name = 'landing-987'
+        get.return_value.json.return_value = dict(
+            requests=[dict(siloname='ubuntu/landing-123')])
+        ticket = Mock(siloname=None)
+        manager = Manager(ticket)
+        manager.assign()
+        ticket.siloname = 'yes'
+        manager.assign()
+        ticket.set_status.assert_called_once_with(
+            'Ready to build', siloname='ubuntu/landing-987')
+
+    @patch('bileto.worker.manager.get')
+    @patch('bileto.worker.manager.lp')
+    def test_manager_assign_fail(self, lp_mock, get):
+        """Fail correctly when no silos available."""
+        lp_mock.ppa_team.ppas = [Mock(distribution_link='/ubuntu')]
+        lp_mock.ppa_team.ppas[0].name = 'landing-987'
+        get.return_value.json.return_value = dict(
+            requests=[dict(siloname='ubuntu/landing-987')])
+        ticket = Mock(siloname=None)
+        manager = Manager(ticket)
+        with self.assertRaisesRegex(BiletoError, 'No silos'):
+            manager.assign()
+
+    def test_manager_validate(self):
+        """Do global validation."""
+        ticket = Mock()
+        manager = Manager(ticket)
+        manager.validate()
+        self.assertEqual(ticket.mock_calls, [
+            call.validate(),
+        ])
+
     @patch('bileto.worker.manager.Manager.__getattr__')
     def test_manager_upload(self, getattr_mock):
         """Prevent cancellation after uploading."""
@@ -228,6 +270,7 @@
     @patch('bileto.worker.manager.Package')
     @patch('bileto.worker.manager.Manager.packages')
     @patch('bileto.worker.manager.environ', DIFF_ENV)
+    @patch('bileto.worker.vcs.create_subprocess_exec', POST_DIFF)
     def test_manager_diff(self, packages, package):
         """Force diffing against all packages even if not all were built."""
         called = []
@@ -239,54 +282,77 @@
         instance = Mock()
         instance.diff = appender
         packages.return_value = dict(blip=instance, glorp=instance)
-        ticket = Mock(sources='blip glorp')
+        ticket = Mock(sources='blip glorp', request_id=5)
         manager = Manager(ticket)
         manager.diff()
-        package.pre_diff.assert_called_once_with(ticket)
-        package.post_diff.assert_called_once_with(ticket)
         self.assertEqual(called, [True, True])
-        self.assertEqual(DIFF_ENV, dict(INCLUDES='blip glorp'))
+        self.assertEqual(DIFF_ENV['INCLUDES'], 'blip glorp')
         packages.cache_clear.assert_called_once_with()
-
-    @patch('bileto.worker.manager.lp')
-    def test_manager_nuke(self, lp_mock):
-        """Delete ephemeral PPA during nuke phase."""
-        ticket = Mock(request_id='5')
-        manager = Manager(ticket)
-        manager.nuke()
-        self.assertEqual(
-            str(lp_mock.mock_calls),
-            "[call.ppa_team.getPPAByName(name='05'),\n"
-            " call.ppa_team.getPPAByName().web_link.__str__(),\n"
-            " call.ppa_team.getPPAByName().lp_delete()]")
-
-    @patch('bileto.worker.manager.lp')
-    def test_manager_nuke_again(self, lp_mock):
-        """Don't explode if the same PPA is nuked twice in a row."""
-        lp_mock.ppa_team.getPPAByName.return_value.lp_delete.side_effect = (
-            BadRequest(b'', b'Archive already deleted'))
-        ticket = Mock(request_id='5')
-        manager = Manager(ticket)
-        manager.nuke()
-        self.assertEqual(
-            str(lp_mock.mock_calls),
-            "[call.ppa_team.getPPAByName(name='05'),\n"
-            " call.ppa_team.getPPAByName().web_link.__str__(),\n"
-            " call.ppa_team.getPPAByName().lp_delete()]")
-
-    @patch('bileto.worker.manager.lp')
-    def test_manager_nuke_invalid(self, lp_mock):
-        """Don't explode if a non-existing PPA is nuked."""
-        lp_mock.ppa_team.getPPAByName.return_value.lp_delete.side_effect = (
-            AttributeError)
-        ticket = Mock(request_id='5')
-        manager = Manager(ticket)
-        manager.nuke()
-        self.assertEqual(
-            str(lp_mock.mock_calls),
-            "[call.ppa_team.getPPAByName(name='05'),\n"
-            " call.ppa_team.getPPAByName().web_link.__str__(),\n"
-            " call.ppa_team.getPPAByName().lp_delete()]")
+        env = POST_DIFF.mock_calls[0][2]['env']
+        self.assertEqual(env['ACTION'], 'swift_upload')
+        self.assertSequenceEqual(POST_DIFF.mock_calls, [
+            call(join(Config.ROOT, 'scripts', 'vcs.sh'),
+                 env=env, stdout=PIPE, stderr=PIPE),
+        ])
+        self.assertEqual(ticket.mock_calls, [
+            call.commit(),
+        ])
+        self.assertEqual(ticket.artifacts, 'swift/diff (9000 lines)')
+
+    @patch('bileto.worker.manager.Manager.ppa')
+    @patch('bileto.worker.vcs.create_subprocess_exec', POST_NUKE)
+    def test_manager_nuke(self, ppa):
+        """Empty PPA when freeing."""
+        source = Mock(status='Published')
+        ppa.getPublishedSources.return_value = [source]
+        ticket = Mock(request_id='5')
+        manager = Manager(ticket)
+        manager.nuke('From Orbit')
+        source.requestDeletion.assert_called_once_with()
+        self.assertEqual(ticket.mock_calls, [
+            call.set_status('From Orbit', siloname=EMPTY, artifacts=EMPTY),
+            call.commit(),
+        ])
+
+    # @patch('bileto.worker.manager.lp')
+    # def test_manager_nuke(self, lp_mock):
+    #     """Delete ephemeral PPA during nuke phase."""
+    #     ticket = Mock(request_id='5')
+    #     manager = Manager(ticket)
+    #     manager.nuke()
+    #     self.assertEqual(
+    #         str(lp_mock.mock_calls),
+    #         "[call.ppa_team.getPPAByName(name='05'),\n"
+    #         " call.ppa_team.getPPAByName().web_link.__str__(),\n"
+    #         " call.ppa_team.getPPAByName().lp_delete()]")
+    #
+    # @patch('bileto.worker.manager.lp')
+    # def test_manager_nuke_again(self, lp_mock):
+    #     """Don't explode if the same PPA is nuked twice in a row."""
+    #     lp_mock.ppa_team.getPPAByName.return_value.lp_delete.side_effect = (
+    #         BadRequest(b'', b'Archive already deleted'))
+    #     ticket = Mock(request_id='5')
+    #     manager = Manager(ticket)
+    #     manager.nuke()
+    #     self.assertEqual(
+    #         str(lp_mock.mock_calls),
+    #         "[call.ppa_team.getPPAByName(name='05'),\n"
+    #         " call.ppa_team.getPPAByName().web_link.__str__(),\n"
+    #         " call.ppa_team.getPPAByName().lp_delete()]")
+
+    # @patch('bileto.worker.manager.lp')
+    # def test_manager_nuke_invalid(self, lp_mock):
+    #     """Don't explode if a non-existing PPA is nuked."""
+    #     lp_mock.ppa_team.getPPAByName.return_value.lp_delete.side_effect = (
+    #         AttributeError)
+    #     ticket = Mock(request_id='5')
+    #     manager = Manager(ticket)
+    #     manager.nuke()
+    #     self.assertEqual(
+    #         str(lp_mock.mock_calls),
+    #         "[call.ppa_team.getPPAByName(name='05'),\n"
+    #         " call.ppa_team.getPPAByName().web_link.__str__(),\n"
+    #         " call.ppa_team.getPPAByName().lp_delete()]")
 
     @patch('bileto.worker.manager.lp')
     def test_manager_ppa_ephemeral(self, lp_mock):
 
=== modified file 'tests/test_worker_merge.py'
--- tests/test_worker_merge.py	2016-06-15 06:14:03 +0000
+++ tests/test_worker_merge.py	2016-06-16 06:25:31 +0000
@@ -31,6 +31,8 @@
     (b'Jimmy <[e-mail]>, Sally <[e-mail]>, Suzy <[e-mail]>, ', b''), STD,
 ])
 EXPOSE = fake_subproc(0, [STD])
+MERGE = fake_subproc(0, [STD, STD])
+PUSH = fake_subproc(0, [STD])
 
 
 class MergeTestCase(WorkerTestCase):
@@ -151,3 +153,39 @@
                  'lp:~/ofono/ofono-ubuntu-xenial-12321',
                  env=env, stdout=PIPE, stderr=PIPE),
         ])
+
+    @patch('bileto.worker.vcs.create_subprocess_exec', MERGE)
+    def test_merge_merge(self):
+        """Merge trunks back into workdir."""
+        Merge.all_mps = dict(ofono=[self.mp])
+        merge = Merge('ofono', self.distro, self.series, self.dest, self.ppa)
+        self.run_coro(merge.merge())
+        env1 = MERGE.mock_calls[0][2]['env']
+        self.assertEqual(env1['SOURCE'], 'ofono')
+        self.assertEqual(env1['SERIES'], 'xenial')
+        self.assertEqual(env1['ACTION'], 'fetch_work_branch')
+        env2 = MERGE.mock_calls[1][2]['env']
+        self.assertEqual(env2['ACTION'], 'merge_trunk')
+        self.assertSequenceEqual(MERGE.mock_calls, [
+            call(join(Config.ROOT, 'scripts', 'vcs.sh'),
+                 'lp:~/ofono/ofono-ubuntu-xenial-12321',
+                 env=env1, stdout=PIPE, stderr=PIPE),
+            call(join(Config.ROOT, 'scripts', 'vcs.sh'),
+                 'lp:ofono',
+                 env=env2, stdout=PIPE, stderr=PIPE),
+        ])
+
+    @patch('bileto.worker.vcs.create_subprocess_exec', PUSH)
+    def test_merge_push(self):
+        """Push to trunks."""
+        Merge.all_mps = dict(ofono=[self.mp])
+        merge = Merge('ofono', self.distro, self.series, self.dest, self.ppa)
+        self.run_coro(merge.push())
+        env = PUSH.mock_calls[0][2]['env']
+        self.assertEqual(env['SOURCE'], 'ofono')
+        self.assertEqual(env['SERIES'], 'xenial')
+        self.assertEqual(env['ACTION'], 'push_to_trunk')
+        self.assertSequenceEqual(PUSH.mock_calls, [
+            call(join(Config.ROOT, 'scripts', 'vcs.sh'),
+                 'lp:ofono', env=env, stdout=PIPE, stderr=PIPE),
+        ])
 
=== modified file 'tests/test_worker_package.py'
--- tests/test_worker_package.py	2016-06-04 00:33:30 +0000
+++ tests/test_worker_package.py	2016-06-16 06:25:31 +0000
@@ -12,26 +12,15 @@
 from bileto.settings import Config
 from bileto.worker.package import Package
 
-
+EMPTY = ''
 BUILD = fake_subproc(0, [(b'', b'')])
 UPLOAD = fake_subproc(0, [(b'', b'')])
 DIFF = fake_subproc(0, [(b'', b''), (b'', b'')])
-POST_DIFF = fake_subproc(0, [(b'swift/diff (9000 lines)', b'')])
 
 
 class PackageTestCase(WorkerTestCase):
     """Test Packages."""
 
-    def test_package_post_validate(self):
-        """Do global validation steps."""
-        ticket = Mock()
-        package = Package('foo', self.distro, self.series, self.dest, self.ppa)
-        package.post_validate(ticket)
-        self.assertEqual(ticket.mock_calls, [
-            call.validate(),
-            call.summarize(),
-        ])
-
     @patch('bileto.worker.vcs.create_subprocess_exec', BUILD)
     def test_package_build(self):
         """Invoke package building."""
@@ -101,28 +90,3 @@
             call(source_name='dif', distro_series=self.series,
                  exact_match=True, order_by_date=True),
         ])
-
-    @patch('bileto.worker.vcs.create_subprocess_exec', POST_DIFF)
-    def test_package_post_diff(self):
-        """Invoke swift diff uploading."""
-        ticket = Mock(request_id='5')
-        Package.post_diff(ticket)
-        env = POST_DIFF.mock_calls[0][2]['env']
-        self.assertEqual(env['REQUESTID'], '5')
-        self.assertEqual(env['ACTION'], 'swift_upload')
-        self.assertSequenceEqual(POST_DIFF.mock_calls, [
-            call(join(Config.ROOT, 'scripts', 'vcs.sh'),
-                 env=env, stdout=PIPE, stderr=PIPE),
-        ])
-        self.assertEqual(ticket.mock_calls, [
-            call.commit(),
-        ])
-        self.assertEqual(ticket.artifacts, 'swift/diff (9000 lines)')
-
-    def test_package_post_abandon(self):
-        """Set abandonment status."""
-        ticket = Mock(request_id='5')
-        Package.post_abandon(ticket)
-        self.assertEqual(ticket.mock_calls, [
-            call.set_status('Abandoned'),
-        ])