launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/kill-pserv-factory into lp:maas with lp:~jtv/maas/decobblerate-pserv-factory as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/kill-pserv-factory/+merge/119889

This gets rid of the last fake functionality that the provisioningserver needed a factory module for.

More to come.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/kill-pserv-factory/+merge/119889
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/kill-pserv-factory into lp:maas.

=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2012-08-16 07:32:11 +0000
+++ src/metadataserver/tests/test_api.py	2012-08-16 10:40:26 +0000
@@ -46,7 +46,6 @@
     NodeUserData,
     )
 from metadataserver.nodeinituser import get_node_init_user
-from provisioningserver.testing.factory import ProvisioningFakeFactory
 
 
 class TestHelpers(DjangoTestCase):
@@ -119,7 +118,7 @@
         self.assertEqual(node, get_queried_node(request))
 
 
-class TestViews(DjangoTestCase, ProvisioningFakeFactory):
+class TestViews(DjangoTestCase):
     """Tests for the API views."""
 
     def make_node_client(self, node=None):
@@ -592,7 +591,7 @@
             response)
 
 
-class TestEnlistViews(DjangoTestCase, ProvisioningFakeFactory):
+class TestEnlistViews(DjangoTestCase):
     """Tests for the enlistment metadata views."""
 
     def test_get_instance_id(self):

=== removed file 'src/provisioningserver/testing/factory.py'
--- src/provisioningserver/testing/factory.py	2012-08-16 10:40:26 +0000
+++ src/provisioningserver/testing/factory.py	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Provisioning test-objects factory."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
-__all__ = [
-    'ProvisioningFakeFactory',
-    ]
-
-from abc import ABCMeta
-from itertools import count
-from time import time
-from xmlrpclib import Fault
-
-from provisioningserver.enum import POWER_TYPE
-from twisted.internet.defer import (
-    inlineCallbacks,
-    returnValue,
-    )
-
-
-names = ("test%d" % num for num in count(int(time())))
-
-
-def fake_name():
-    """Return a fake name. Each call returns a different name."""
-    return next(names)
-
-
-class ProvisioningFakeFactory:
-    """Mixin for test cases: factory of fake provisioning objects.
-
-    This can be used while testing against a real Cobbler, or a real
-    provisioning server with a fake Cobbler, or a fake provisioning server.
-
-    All objects you create using this factory will be cleaned up at the end of
-    each test.
-    """
-
-    __metaclass__ = ABCMeta
-
-    @staticmethod
-    def clean_up_objects(deleter, *object_names):
-        """Remove named objects from the PAPI.
-
-        `delete_func` is expected to be one of the ``delete_*_by_name``
-        methods of the Provisioning API. XML-RPC errors are ignored; this
-        function does its best to remove the object but a failure to do so is
-        not an error.
-        """
-        d = deleter(object_names)
-        if d is not None:
-            d.addErrback(lambda failure: failure.trap(Fault))
-        return d
-
-    @inlineCallbacks
-    def add_distro(self, papi, name=None):
-        """Creates a new distro object via `papi`.
-
-        Arranges for it to be deleted during test clean-up. If `name` is not
-        specified, `fake_name` will be called to obtain one.
-        """
-        if name is None:
-            name = fake_name()
-        # For the initrd and kernel, use a file that we know will exist for a
-        # running Cobbler instance (at least, on Ubuntu) so that we can test
-        # against remote instances, like one in odev.
-        initrd = "/etc/cobbler/settings"
-        kernel = "/etc/cobbler/version"
-        distro_name = yield papi.add_distro(name, initrd, kernel)
-        self.addCleanup(
-            self.clean_up_objects,
-            papi.delete_distros_by_name,
-            distro_name)
-        returnValue(distro_name)
-
-    @inlineCallbacks
-    def add_profile(self, papi, name=None, distro_name=None):
-        """Creates a new profile object via `papi`.
-
-        Arranges for it to be deleted during test clean-up. If `name` is not
-        specified, `fake_name` will be called to obtain one. If `distro_name`
-        is not specified, one will be obtained by calling `add_distro`.
-        """
-        if name is None:
-            name = fake_name()
-        if distro_name is None:
-            distro_name = yield self.add_distro(papi)
-        profile_name = yield papi.add_profile(name, distro_name)
-        self.addCleanup(
-            self.clean_up_objects,
-            papi.delete_profiles_by_name,
-            profile_name)
-        returnValue(profile_name)
-
-    @inlineCallbacks
-    def add_node(self, papi, name=None, hostname=None, profile_name=None,
-                 power_type=None, preseed_data=None):
-        """Creates a new node object via `papi`.
-
-        Arranges for it to be deleted during test clean-up. If `name` is not
-        specified, `fake_name` will be called to obtain one. If `profile_name`
-        is not specified, one will be obtained by calling `add_profile`.
-        """
-        if name is None:
-            name = fake_name()
-        if hostname is None:
-            hostname = fake_name()
-        if profile_name is None:
-            profile_name = yield self.add_profile(papi)
-        if power_type is None:
-            power_type = POWER_TYPE.WAKE_ON_LAN
-        if preseed_data is None:
-            preseed_data = ""
-        node_name = yield papi.add_node(
-            name, hostname, profile_name, power_type, preseed_data)
-        self.addCleanup(
-            self.clean_up_objects,
-            papi.delete_nodes_by_name,
-            node_name)
-        returnValue(node_name)