Merge ~mpontillo/maas:move-to-bionic--mpontillo into maas:master

[Mike Pontillo]

A few additions to Blake's move-to-bionic branch.

17f57fb... by Mike Pontillo on 2018-01-03

Fix lint.

2e64536... by Mike Pontillo on 2018-01-04

Fix random failure in get_maas_version() tests.

Unmerged commits

2e64536... by Mike Pontillo on 2018-01-04

Fix random failure in get_maas_version() tests.

17f57fb... by Mike Pontillo on 2018-01-03

Fix lint.

a233a00... by Mike Pontillo on 2017-12-21

Fix Django deprecation warnings.

02e5140... by Mike Pontillo on 2017-12-21

Remove unused installed_curtin_version variable.

0a07b40... by Blake Rouse on 2017-12-15

Fix more tests and remove old code that is no longer used.

02085c2... by Blake Rouse on 2017-12-15

Remove deprecated calls that break tests.

a6ff200... by Blake Rouse on 2017-12-15

Add new bionic packages. Remove old releases that 2.4 will not run on. Fix versions.cfg to work with new dependencies in bionic.

diff --git a/required-packages/artful b/required-packages/bionic
index aad4c80..aad4c80 100644
--- a/required-packages/artful
+++ b/required-packages/bionic
diff --git a/required-packages/wily b/required-packages/wily
deleted file mode 100644
index aad4c80..0000000
--- a/required-packages/wily
+++ /dev/null
@@ -1,2 +0,0 @@
-pxelinux
-python3-petname
diff --git a/required-packages/xenial b/required-packages/xenial
deleted file mode 100644
index aad4c80..0000000
--- a/required-packages/xenial
+++ /dev/null
@@ -1,2 +0,0 @@
-pxelinux
-python3-petname
diff --git a/required-packages/yakkety b/required-packages/yakkety
deleted file mode 100644
index aad4c80..0000000
--- a/required-packages/yakkety
+++ /dev/null
@@ -1,2 +0,0 @@
-pxelinux
-python3-petname
diff --git a/required-packages/zesty b/required-packages/zesty
deleted file mode 100644
index aad4c80..0000000
--- a/required-packages/zesty
+++ /dev/null
@@ -1,2 +0,0 @@
-pxelinux
-python3-petname
diff --git a/src/maasserver/api/auth.py b/src/maasserver/api/auth.py
index a14ba60..f443d97 100644
--- a/src/maasserver/api/auth.py
+++ b/src/maasserver/api/auth.py
@@ -44,7 +44,7 @@ class MAASAPIAuthentication(OAuthAuthentication):
     """
 
     def is_authenticated(self, request):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             return request.user
 
         # The following is much the same as is_authenticated from Piston's
diff --git a/src/maasserver/context_processors.py b/src/maasserver/context_processors.py
index 39b1898..87ecc39 100644
--- a/src/maasserver/context_processors.py
+++ b/src/maasserver/context_processors.py
@@ -34,7 +34,7 @@ def global_options(request):
     user_completed_intro = False
     if hasattr(request.user, 'userprofile'):
         user_completed_intro = request.user.userprofile.completed_intro
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         analytics_user_id = '%s-user%d' % (uuid, request.user.id)
     else:
         analytics_user_id = '%s-anon' % uuid
diff --git a/src/maasserver/forms/interface_link.py b/src/maasserver/forms/interface_link.py
index 2c02dc5..adfa4cf 100644
--- a/src/maasserver/forms/interface_link.py
+++ b/src/maasserver/forms/interface_link.py
@@ -298,11 +298,11 @@ class InterfaceSetDefaultGatwayForm(forms.Form):
             IPAddress(gateway).version
             for gateway in unique_gateways
             )
-        too_many = [
+        too_many = sorted([
             ip_family
             for ip_family, count in gateway_versions.items()
             if count > 1
-        ]
+        ])
         if len(too_many) > 0:
             set_form_error(
                 self, "link_id",
diff --git a/src/maasserver/middleware.py b/src/maasserver/middleware.py
index bde3fc7..8d49fb9 100644
--- a/src/maasserver/middleware.py
+++ b/src/maasserver/middleware.py
@@ -105,7 +105,7 @@ class AccessMiddleware:
         if is_public_path(request.path_info):
             return None
 
-        if request.user.is_anonymous():
+        if request.user.is_anonymous:
             return HttpResponseRedirect("%s?next=%s" % (
                 reverse('login'), urlquote_plus(request.path)))
 
diff --git a/src/maasserver/migrations/builtin/maasserver/0125_add_switch_model.py b/src/maasserver/migrations/builtin/maasserver/0125_add_switch_model.py
index 476baf3..66030f3 100644
--- a/src/maasserver/migrations/builtin/maasserver/0125_add_switch_model.py
+++ b/src/maasserver/migrations/builtin/maasserver/0125_add_switch_model.py
@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
                 ('updated', models.DateTimeField(editable=False)),
                 ('nos_driver', models.CharField(max_length=64, blank=True, default='')),
                 ('nos_parameters', maasserver.fields.JSONObjectField(max_length=32768, blank=True, default='')),
-                ('node', models.OneToOneField(to='maasserver.Node')),
+                ('node', models.OneToOneField(to='maasserver.Node', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Switch',
diff --git a/src/maasserver/migrations/builtin/maasserver/0126_add_controllerinfo_model.py b/src/maasserver/migrations/builtin/maasserver/0126_add_controllerinfo_model.py
index 8a386e7..a4515a7 100644
--- a/src/maasserver/migrations/builtin/maasserver/0126_add_controllerinfo_model.py
+++ b/src/maasserver/migrations/builtin/maasserver/0126_add_controllerinfo_model.py
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('created', models.DateTimeField(editable=False)),
                 ('updated', models.DateTimeField(editable=False)),
-                ('node', models.OneToOneField(serialize=False, primary_key=True, to='maasserver.Node')),
+                ('node', models.OneToOneField(serialize=False, primary_key=True, to='maasserver.Node', on_delete=models.CASCADE)),
                 ('version', models.CharField(blank=True, null=True, max_length=255)),
                 ('interfaces', maasserver.fields.JSONObjectField(default='', blank=True, max_length=32768)),
                 ('interface_update_hints', maasserver.fields.JSONObjectField(default='', blank=True, max_length=32768)),
@@ -38,6 +38,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='switch',
             name='node',
-            field=models.OneToOneField(serialize=False, primary_key=True, to='maasserver.Node'),
+            field=models.OneToOneField(serialize=False, primary_key=True, to='maasserver.Node', on_delete=models.CASCADE),
         ),
     ]
diff --git a/src/maasserver/migrations/builtin/maasserver/0127_nodemetadata.py b/src/maasserver/migrations/builtin/maasserver/0127_nodemetadata.py
index 98f4960..ba3d3aa 100644
--- a/src/maasserver/migrations/builtin/maasserver/0127_nodemetadata.py
+++ b/src/maasserver/migrations/builtin/maasserver/0127_nodemetadata.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
                 ('updated', models.DateTimeField(editable=False)),
                 ('key', models.CharField(max_length=64)),
                 ('value', models.TextField()),
-                ('node', models.ForeignKey(to='maasserver.Node', editable=False)),
+                ('node', models.ForeignKey(to='maasserver.Node', editable=False, on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'NodeMetadata',
diff --git a/src/maasserver/models/tests/test_dnspublication.py b/src/maasserver/models/tests/test_dnspublication.py
index f4374af..cd1ce20 100644
--- a/src/maasserver/models/tests/test_dnspublication.py
+++ b/src/maasserver/models/tests/test_dnspublication.py
@@ -41,14 +41,13 @@ class TestZoneSerial(MAASServerTestCase):
     def test_parameters_in_database(self):
         zone_serial.create_if_not_exists()
         query = (
-            "SELECT start_value, increment_by, max_value, "
-            "min_value, is_cycled FROM %s" % zone_serial.name
+            "SELECT last_value, log_cnt, is_called FROM %s" % zone_serial.name
         )
         with connection.cursor() as cursor:
             cursor.execute(query)
             self.assertThat(
                 cursor.fetchone(), Equals(
-                    (1, 1, 2 ** 32 - 1, 1, True)))
+                    (3, 0, True)))
 
 
 class TestDNSPublication(MAASServerTestCase):
diff --git a/src/maasserver/static/js/angular/directives/pod_parameters.js b/src/maasserver/static/js/angular/directives/pod_parameters.js
index 4ede72e..4e05584 100644
--- a/src/maasserver/static/js/angular/directives/pod_parameters.js
+++ b/src/maasserver/static/js/angular/directives/pod_parameters.js
@@ -70,8 +70,10 @@ angular.module('MAAS').directive(
                   });
                   html += '</maas-obj-field-group>';
                   childScope = scope.$new();
-                  fieldsElement.append($compile(html)(
-                      childScope, undefined, {maasObjForm: controller}));
+                  var ele = angular.element(html);
+                  fieldsElement.append(ele);
+                  $compile(ele)(
+                      childScope, undefined, {maasObjForm: controller});
                 }
             };
 
diff --git a/src/maasserver/static/js/angular/directives/tests/test_os_select.js b/src/maasserver/static/js/angular/directives/tests/test_os_select.js
index 6cd5d1a..9928063 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_os_select.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_os_select.js
@@ -242,8 +242,11 @@ describe("maasOsSelect", function() {
             release: ""
         };
         $scope.$digest();
-        expect(directive.isolateScope().releases).toEqual(
-            [['ubuntu/xenial', 'xenial']]);
+        var release = directive.isolateScope().releases[0].map(function(txt) {
+          return new String(txt);
+        });
+        expect(release).toEqual(
+            ['ubuntu/xenial', 'xenial']);
     });
 
 });
diff --git a/src/maasserver/testing/api.py b/src/maasserver/testing/api.py
index ed71da0..43a4f3e 100644
--- a/src/maasserver/testing/api.py
+++ b/src/maasserver/testing/api.py
@@ -171,7 +171,7 @@ class APITestCaseBase(MAASTestCase, metaclass=APITestType):
     @transactional
     def become_admin(self):
         """Promote `self.user` to admin."""
-        self.assertFalse(self.user.is_anonymous(), (
+        self.assertFalse(self.user.is_anonymous, (
             "Cannot promote anonymous user to admin."))
         self.user.is_superuser = True
         self.user.save()
diff --git a/src/maasserver/testing/testclient.py b/src/maasserver/testing/testclient.py
index 05cac37..a0cd0e4 100644
--- a/src/maasserver/testing/testclient.py
+++ b/src/maasserver/testing/testclient.py
@@ -52,7 +52,7 @@ class MAASSensibleClient(SensibleClient):
     def login(self, *, user=None, **credentials):
         if user is None:
             return super(MAASSensibleClient, self).login(**credentials)
-        elif user.is_anonymous():
+        elif user.is_anonymous:
             self.logout()
             return False
         else:
@@ -87,7 +87,7 @@ class MAASSensibleOAuthClient(MAASSensibleClient):
             assert token is not None
             return self._token_set(token)
         else:
-            if user.is_anonymous():
+            if user.is_anonymous:
                 self._token_clear()
                 return False
             elif token is None:
diff --git a/src/maasserver/tests/test_sequence.py b/src/maasserver/tests/test_sequence.py
index 61c0f62..561bc76 100644
--- a/src/maasserver/tests/test_sequence.py
+++ b/src/maasserver/tests/test_sequence.py
@@ -14,7 +14,7 @@ from django.db import (
 )
 from django.db.utils import (
     DatabaseError,
-    OperationalError,
+    DataError,
     ProgrammingError,
 )
 from maasserver.sequence import Sequence
@@ -92,7 +92,7 @@ class TestSequence(MAASServerTestCase):
         seq.create()
         self.assertSequenceEqual([1, 2], [next(seq), next(seq)])
         self.assertRaisesRegex(
-            OperationalError, "nextval: reached maximum value of sequence",
+            DataError, "nextval: reached maximum value of sequence",
             next, seq)
 
     def test_sequence_can_be_owned(self):
diff --git a/src/maasserver/views/account.py b/src/maasserver/views/account.py
index 5a84695..a146afa 100644
--- a/src/maasserver/views/account.py
+++ b/src/maasserver/views/account.py
@@ -39,7 +39,7 @@ def login(request):
         'no_users': UserProfile.objects.all_users().count() == 0,
         'create_command': django_settings.MAAS_CLI,
         }
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return HttpResponseRedirect(reverse('index'))
     else:
         redirect_url = request.GET.get(
diff --git a/src/metadataserver/migrations/builtin/0013_scriptresult_physicalblockdevice.py b/src/metadataserver/migrations/builtin/0013_scriptresult_physicalblockdevice.py
index c16eca4..e164b9a 100644
--- a/src/metadataserver/migrations/builtin/0013_scriptresult_physicalblockdevice.py
+++ b/src/metadataserver/migrations/builtin/0013_scriptresult_physicalblockdevice.py
@@ -18,11 +18,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='scriptresult',
             name='physical_blockdevice',
-            field=models.ForeignKey(to='maasserver.PhysicalBlockDevice', null=True, editable=False, blank=True),
+            field=models.ForeignKey(to='maasserver.PhysicalBlockDevice', null=True, editable=False, blank=True, on_delete=models.CASCADE),
         ),
         migrations.AlterField(
             model_name='scriptresult',
             name='script',
-            field=models.ForeignKey(to='metadataserver.Script', null=True, editable=False, blank=True),
+            field=models.ForeignKey(to='metadataserver.Script', null=True, editable=False, blank=True, on_delete=models.CASCADE),
         ),
     ]
diff --git a/src/provisioningserver/utils/shell.py b/src/provisioningserver/utils/shell.py
index 826c776..5567ed1 100644
--- a/src/provisioningserver/utils/shell.py
+++ b/src/provisioningserver/utils/shell.py
@@ -6,37 +6,18 @@
 __all__ = [
     'call_and_check',
     'ExternalProcessError',
-    'pipefork',
-    'PipeForkError',
     'select_c_utf8_bytes_locale',
     'select_c_utf8_locale',
 ]
 
-from contextlib import contextmanager
 import os
-import pickle
 from pipes import quote
-import signal
 from string import printable
 from subprocess import (
     CalledProcessError,
     PIPE,
     Popen,
 )
-from sys import (
-    stderr,
-    stdout,
-)
-from tempfile import TemporaryFile
-
-from twisted.python.failure import Failure
-
-# A mapping of signal numbers to names. It is strange that this isn't in the
-# standard library (but I did check).
-signal_names = {
-    value: name for name, value in vars(signal).items()
-    if name.startswith('SIG') and '_' not in name
-}
 
 # A table suitable for use with str.translate() to replace each
 # non-printable and non-ASCII character in a byte string with a question
@@ -132,178 +113,6 @@ def call_and_check(command, *args, **kwargs):
     return stdout
 
 
-class PipeForkError(Exception):
-    """An error occurred in `pipefork`."""
-
-
-@contextmanager
-def pipefork():
-    """Context manager that forks with pipes between parent and child.
-
-    Use like so::
-
-        with pipefork() as (pid, fin, fout):
-            if pid == 0:
-                # This is the child.
-                ...
-            else:
-                # This is the parent.
-                ...
-
-    Pipes are set up so that the parent can write to the child, and
-    vice-versa.
-
-    In the child, ``fin`` is a file that reads from the parent, and ``fout``
-    is a file that writes to the parent.
-
-    In the parent, ``fin`` is a file that reads from the child, and ``fout``
-    is a file that writes to the child.
-
-    Be careful to think about closing these file objects to avoid deadlocks.
-    For example, the following will deadlock:
-
-        with pipefork() as (pid, fin, fout):
-            if pid == 0:
-                fin.read()  # Read from the parent.
-                fout.write(b'Moien')  # Greet the parent.
-            else:
-                fout.write(b'Hello')  # Greet the child.
-                fin.read()  # Read from the child *BLOCKS FOREVER*
-
-    The reason is that the read in the child never returns because the pipe is
-    never closed. Closing ``fout`` in the parent resolves the problem::
-
-        with pipefork() as (pid, fin, fout):
-            if pid == 0:
-                fin.read()  # Read from the parent.
-                fout.write(b'Moien')  # Greet the parent.
-            else:
-                fout.write(b'Hello')  # Greet the child.
-                fout.close()  # Close the write pipe to the child.
-                fin.read()  # Read from the child.
-
-    Exceptions raised in the child are magically re-raised in the parent. When
-    the child has died for another reason, a signal perhaps, a `PipeForkError`
-    is raised with an explanatory message.
-
-    Signal handlers in the child are NOT modified. This means that signal
-    handlers set in the parent will still be present in the child.
-
-    :raises: `PipeForkError` when the child process dies a somewhat unnatural
-        death, e.g. by a signal or when writing a crash-dump fails.
-    """
-    crashfile = TemporaryFile()
-
-    c2pread, c2pwrite = os.pipe()
-    p2cread, p2cwrite = os.pipe()
-
-    pid = os.fork()
-
-    if pid == 0:
-        # Child: this conditional branch runs in the child process.
-        try:
-            os.close(c2pread)
-            os.close(p2cwrite)
-
-            with os.fdopen(p2cread, 'rb') as fin:
-                with os.fdopen(c2pwrite, 'wb') as fout:
-                    yield pid, fin, fout
-
-            stdout.flush()
-            stderr.flush()
-        except SystemExit as se:
-            # Exit hard, not soft.
-            os._exit(se.code)
-        except:
-            try:
-                # Pickle error to crash file.
-                pickle.dump(Failure(), crashfile, pickle.HIGHEST_PROTOCOL)
-                crashfile.flush()
-            finally:
-                # Exit hard.
-                os._exit(2)
-        finally:
-            # Exit hard.
-            os._exit(0)
-    else:
-        # Parent: this conditional branch runs in the parent process.
-        os.close(c2pwrite)
-        os.close(p2cread)
-
-        with os.fdopen(c2pread, 'rb') as fin:
-            with os.fdopen(p2cwrite, 'wb') as fout:
-                yield pid, fin, fout
-
-        # Wait for the child to finish.
-        _, status = os.waitpid(pid, 0)
-        signal = (status & 0xff)
-        code = (status >> 8) & 0xff
-
-        # Check for a saved crash.
-        crashfile.seek(0)
-        try:
-            error = pickle.load(crashfile)
-        except EOFError:
-            # No crash was recorded.
-            error = None
-        else:
-            # Raise exception from child.
-            error.raiseException()
-        finally:
-            crashfile.close()
-
-        if os.WIFSIGNALED(status):
-            # The child was killed by a signal.
-            raise PipeForkError(
-                "Child killed by signal %d (%s)" % (
-                    signal, signal_names.get(signal, "?")))
-        elif code != 0:
-            # The child exited with a non-zero code.
-            raise PipeForkError(
-                "Child exited with code %d" % code)
-        else:
-            # All okay.
-            pass
-
-
-@contextmanager
-def objectfork():
-    """Like `pipefork`, but objects can be passed between parent and child.
-
-    Usage::
-
-        with objectfork() as (pid, recv, send):
-            if pid == 0:
-                # Child.
-                for foo in bar():
-                    send(foo)
-                send(None)  # Done.
-            else:
-                for data in iter(recv, None):
-                    ...  # Process data.
-
-    In the child, ``recv`` receives objects sent -- via `send` -- from
-    the parent.
-
-    In the parent, ``recv`` receives objects sent -- via `send` -- from
-    the child.
-
-    All objects must be picklable.
-
-    See `pipefork` for more details.
-    """
-    with pipefork() as (pid, fin, fout):
-
-        def recv():
-            return pickle.load(fin)
-
-        def send(obj):
-            pickle.dump(obj, fout, pickle.HIGHEST_PROTOCOL)
-            fout.flush()  # cPickle.dump() does not flush.
-
-        yield pid, recv, send
-
-
 def has_command_available(command):
     """Return True if `command` is available on the system."""
     try:
diff --git a/src/provisioningserver/utils/tests/test_network.py b/src/provisioningserver/utils/tests/test_network.py
index 8f1d0e6..401457b 100644
--- a/src/provisioningserver/utils/tests/test_network.py
+++ b/src/provisioningserver/utils/tests/test_network.py
@@ -83,7 +83,6 @@ from provisioningserver.utils.network import (
     resolves_to_loopback_address,
     reverseResolve,
 )
-from provisioningserver.utils.shell import call_and_check
 from testtools import ExpectedException
 from testtools.matchers import (
     Contains,
@@ -107,13 +106,6 @@ from twisted.names.error import (
 )
 
 
-installed_curtin_version = call_and_check([
-    "dpkg-query", "--showformat=${Version}",
-    "--show", "python3-curtin"]).decode("ascii")
-installed_curtin_version = int(
-    installed_curtin_version.split("~bzr", 1)[1].split("-", 1)[0])
-
-
 class TestMakeNetwork(MAASTestCase):
 
     def test_constructs_IPNetwork(self):
diff --git a/src/provisioningserver/utils/tests/test_shell.py b/src/provisioningserver/utils/tests/test_shell.py
index 42a8ab5..96d6dae 100644
--- a/src/provisioningserver/utils/tests/test_shell.py
+++ b/src/provisioningserver/utils/tests/test_shell.py
@@ -6,29 +6,20 @@
 __all__ = []
 
 import os
-from random import randint
-import re
-import signal
 from subprocess import CalledProcessError
-import time
 
 from fixtures import EnvironmentVariable
 from maastesting.factory import factory
-from maastesting.fixtures import DetectLeakedFileDescriptors
 from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import MAASTestCase
 from provisioningserver.utils.shell import (
     call_and_check,
     ExternalProcessError,
     has_command_available,
-    objectfork,
-    pipefork,
-    PipeForkError,
     select_c_utf8_bytes_locale,
     select_c_utf8_locale,
 )
 import provisioningserver.utils.shell as shell_module
-from testtools import ExpectedException
 from testtools.matchers import (
     ContainsDict,
     Equals,
@@ -174,125 +165,6 @@ class TestExternalProcessError(MAASTestCase):
         self.assertEqual(unicode_output, error.output_as_unicode)
 
 
-class TestPipeFork(MAASTestCase):
-
-    def setUp(self):
-        super(TestPipeFork, self).setUp()
-        self.useFixture(DetectLeakedFileDescriptors())
-
-    def test__forks(self):
-        with pipefork() as (pid, fin, fout):
-            if pid == 0:
-                # Child.
-                message_in = fin.read()
-                message_out = b"Hello %s!" % message_in
-                fout.write(message_out)
-                fout.close()
-            else:
-                # Parent.
-                message_out = factory.make_name("Parent").encode("ascii")
-                fout.write(message_out)
-                fout.close()
-                message_in = fin.read()
-                self.assertEqual(b"Hello %s!" % message_out, message_in)
-
-    def test__raises_childs_exception_when_child_crashes(self):
-        # If the child process exits with an exception, it is passed back to
-        # the parent via a pickled t.p.failure.Failure, and re-raised.
-        with ExpectedException(ZeroDivisionError):
-            with pipefork() as (pid, fin, fout):
-                if pid == 0:
-                    # Child.
-                    raise ZeroDivisionError()
-
-    def test__raises_parents_exception_when_parent_crashes(self):
-        # If the parent raises an exception, it is propagated. During
-        # tear-down of the pipefork's context the child is reaped, but any
-        # exceptions (via the crash file, or raised on behalf of the child
-        # because of a non-zero exit code or non-zero signal) propagating back
-        # from the child are masked by the exception in the parent.
-        with ExpectedException(ZeroDivisionError):
-            with pipefork() as (pid, fin, fout):
-                if pid != 0:
-                    # Parent.
-                    raise ZeroDivisionError()
-
-    def test__raises_exception_when_child_killed_by_signal(self):
-        expected_message = re.escape("Child killed by signal 15 (SIGTERM)")
-        with ExpectedException(PipeForkError, expected_message):
-            with pipefork() as (pid, fin, fout):
-                if pid == 0:
-                    # Reset SIGTERM to the default handler; the Twisted
-                    # reactor may have clobbered it in the parent.
-                    signal.signal(signal.SIGTERM, signal.SIG_DFL)
-                    # Close `fout` to signal to parent that we're running.
-                    fout.close()
-                    time.sleep(10)
-                else:
-                    # Wait for child to close its `fout` before signalling.
-                    fin.read()
-                    os.kill(pid, signal.SIGTERM)
-
-    def test__raises_exception_when_child_exits_with_non_zero_code(self):
-        exit_code = randint(1, 99)
-        expected_message = re.escape("Child exited with code %s" % exit_code)
-        with ExpectedException(PipeForkError, expected_message):
-            with pipefork() as (pid, fin, fout):
-                if pid == 0:
-                    os._exit(exit_code)
-
-    def test__SystemExit_in_child_is_not_raised_in_parent(self):
-        # All exceptions are pickled and passed back to the parent process,
-        # except for SystemExit. It instead results in a call to os._exit().
-        exit_code = randint(1, 99)
-        expected_message = re.escape("Child exited with code %s" % exit_code)
-        with ExpectedException(PipeForkError, expected_message):
-            with pipefork() as (pid, fin, fout):
-                if pid == 0:
-                    raise SystemExit(exit_code)
-
-
-class TestObjectFork(MAASTestCase):
-
-    def setUp(self):
-        super(TestObjectFork, self).setUp()
-        self.useFixture(DetectLeakedFileDescriptors())
-
-    def test__can_send_and_receive_objects(self):
-
-        def child(recv, send):
-            # Sum numbers until we get None through.
-            for numbers in iter(recv, None):
-                send(sum(numbers))
-            # Now echo things until we get None.
-            for things in iter(recv, None):
-                send(things)
-
-        def parent(recv, send):
-            # Send numbers to the child first.
-            for _ in range(randint(3, 10)):
-                numbers = list(randint(1, 100) for _ in range(10))
-                send(numbers)
-                self.assertEqual(sum(numbers), recv())
-            # Signal that we're done with numbers.
-            send(None)
-            # Send some other things and see that they come back.
-            picklable_things = {
-                "foo": [randint(1, 1000) for _ in range(10)],
-                (1, 2, b"three", 4.0): {self.__class__, "bar"},
-            }
-            send(picklable_things)
-            self.assertEqual(picklable_things, recv())
-            # Signal that we're done again.
-            send(None)
-
-        with objectfork() as (pid, recv, send):
-            if pid == 0:
-                child(recv, send)
-            else:
-                parent(recv, send)
-
-
 class TestHasCommandAvailable(MAASTestCase):
 
     def test__calls_which(self):
diff --git a/src/provisioningserver/utils/tests/test_version.py b/src/provisioningserver/utils/tests/test_version.py
index de23021..0efd3d9 100644
--- a/src/provisioningserver/utils/tests/test_version.py
+++ b/src/provisioningserver/utils/tests/test_version.py
@@ -359,7 +359,7 @@ class TestVersionMethodsCached(TestVersionTestCase):
                 version.RACK_PACKAGE_NAME, version.REGION_PACKAGE_NAME))
 
 
-class TestGetMAASVersionTuple(MAASTestCase):
+class TestGetMAASVersionTuple(TestVersionTestCase):
 
     def test_get_maas_version_tuple(self):
         mock_repo_hash = self.patch(version, "get_maas_repo_hash")
@@ -369,7 +369,7 @@ class TestGetMAASVersionTuple(MAASTestCase):
             version.get_maas_version_subversion()[0])
 
 
-class TestGetMAASVersionTrackChannel(MAASTestCase):
+class TestGetMAASVersionTrackChannel(TestVersionTestCase):
 
     scenarios = [
         ("alpha", {
diff --git a/versions.cfg b/versions.cfg
index 621727f..42a41b7 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -31,7 +31,7 @@ prompt-toolkit = 1.0.9
 python-mimeparse = 1.6.0
 python-subunit = 1.2.0
 selenium = 2.45
-setuptools = 20.7.0
+setuptools = 36.2.7
 simplegeneric = 0.8.1
 sqlparse = 0.2.2
 termcolor = 1.1.0
@@ -54,5 +54,5 @@ pyflakes = 1.3.0
 # Explicit versions for PACKAGED dependencies. This is where a TEST
 # dependency itself depends on an INSTALL/RUNTIME dependency which is,
 # by force, provided by a system package.
-psycopg2 = 2.6.1
+psycopg2 = 2.7.3
 six = 1.10.0