Merge lp:~stevenk/launchpad/drop-builder-description into lp:launchpad

[Steve Kowalik]

Delete the code portions of Builder.description.

Following on my branch that drops the NOT NULL constraint from Builder.description, this branch removes it from the code and tests.

I have also refactored the portion of builder-views.txt that creates builders to not be disgusting and make small children cry.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/buildmaster/doc/builder.txt'
--- lib/lp/buildmaster/doc/builder.txt	2011-12-24 17:49:30 +0000
+++ lib/lp/buildmaster/doc/builder.txt	2012-05-29 22:37:30 +0000
@@ -82,8 +82,8 @@
 
 The 'new' method will create a new builder in the database.
 
-    >>> bnew = builderset.new(1, 'http://dummy.com:8221/', 'dummy',
-    ...                    'Dummy Title', 'eh ?', 1)
+    >>> bnew = builderset.new(
+    ...     1, 'http://dummy.com:8221/', 'dummy', 'Dummy Title', 1)
     >>> bnew.name
     u'dummy'
 

=== modified file 'lib/lp/buildmaster/interfaces/builder.py'
--- lib/lp/buildmaster/interfaces/builder.py	2012-02-09 23:09:36 +0000
+++ lib/lp/buildmaster/interfaces/builder.py	2012-05-29 22:37:30 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -102,11 +102,11 @@
     Builder instance represents a single builder slave machine within the
     Launchpad Auto Build System. It should specify a 'processor' on which the
     machine is based and is able to build packages for; a URL, by which the
-    machine is accessed through an XML-RPC interface; name, title,
-    description for entity identification and browsing purposes; an LP-like
-    owner which has unrestricted access to the instance; the build slave
-    machine status representation, including the field/properties:
-    virtualized, builderok, status, failnotes and currentjob.
+    machine is accessed through an XML-RPC interface; name, title for entity
+    identification and browsing purposes; an LP-like owner which has
+    unrestricted access to the instance; the build slave machine status
+    representation, including the field/properties: virtualized, builderok,
+    status, failnotes and currentjob.
     """
     export_as_webservice_entry()
 
@@ -139,12 +139,6 @@
         description=_(
             'The builder slave title. Should be just a few words.')))
 
-    description = exported(Description(
-        title=_('Description'), required=False,
-        description=_('The builder slave description, may be several '
-                      'paragraphs of text, giving the highlights and '
-                      'details.')))
-
     virtualized = exported(Bool(
         title=_('Virtualized'), required=True, default=False,
         description=_('Whether or not the builder is a virtual Xen '
@@ -367,8 +361,8 @@
     def getByName(name):
         """Retrieve a builder by name"""
 
-    def new(processor, url, name, title, description, owner,
-            active=True, virtualized=False, vm_host=None):
+    def new(processor, url, name, title, owner, active=True,
+            virtualized=False, vm_host=None):
         """Create a new Builder entry.
 
         Additionally to the given arguments, builder are created with

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2012-02-28 04:24:19 +0000
+++ lib/lp/buildmaster/model/builder.py	2012-05-29 22:37:30 +0000
@@ -410,7 +410,6 @@
     url = StringCol(dbName='url', notNull=True)
     name = StringCol(dbName='name', notNull=True)
     title = StringCol(dbName='title', notNull=True)
-    description = StringCol(dbName='description', notNull=True)
     owner = ForeignKey(
         dbName='owner', foreignKey='Person',
         storm_validator=validate_public_person, notNull=True)
@@ -883,13 +882,12 @@
     def __getitem__(self, name):
         return self.getByName(name)
 
-    def new(self, processor, url, name, title, description, owner,
-            active=True, virtualized=False, vm_host=None, manual=True):
+    def new(self, processor, url, name, title, owner, active=True,
+            virtualized=False, vm_host=None, manual=True):
         """See IBuilderSet."""
         return Builder(processor=processor, url=url, name=name, title=title,
-                       description=description, owner=owner, active=active,
-                       virtualized=virtualized, vm_host=vm_host,
-                       _builderok=True, manual=manual)
+                       owner=owner, active=active, virtualized=virtualized,
+                       vm_host=vm_host, _builderok=True, manual=manual)
 
     def get(self, builder_id):
         """See IBuilderSet."""

=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2012-03-27 04:00:45 +0000
+++ lib/lp/soyuz/browser/builder.py	2012-05-29 22:37:30 +0000
@@ -321,12 +321,11 @@
     label = "Register a new build machine"
 
     field_names = [
-        'name', 'title', 'description', 'processor', 'url',
-        'active', 'virtualized', 'vm_host', 'owner'
+        'name', 'title', 'processor', 'url', 'active', 'virtualized',
+        'vm_host', 'owner'
         ]
 
     custom_widget('owner', HiddenUserWidget)
-    custom_widget('description', TextAreaWidget, height=3)
     custom_widget('url', TextWidget, displayWidth=30)
     custom_widget('vm_host', TextWidget, displayWidth=30)
 
@@ -338,7 +337,6 @@
             url=data.get('url'),
             name=data.get('name'),
             title=data.get('title'),
-            description=data.get('description'),
             owner=data.get('owner'),
             active=data.get('active'),
             virtualized=data.get('virtualized'),
@@ -364,9 +362,8 @@
     schema = IBuilder
 
     field_names = [
-        'name', 'title', 'description', 'processor', 'url', 'manual',
-        'owner', 'virtualized', 'builderok', 'failnotes', 'vm_host',
-        'active',
+        'name', 'title', 'processor', 'url', 'manual', 'owner',
+        'virtualized', 'builderok', 'failnotes', 'vm_host', 'active',
         ]
 
     @action(_('Change'), name='update')

=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt	2012-05-29 22:37:30 +0000
@@ -67,7 +67,6 @@
     ...     print field_name
     name
     title
-    description
     processor
     url
     manual
@@ -259,40 +258,24 @@
     >>> amd64 = Processor.selectOneBy(name='amd64')
     >>> hppa = Processor.selectOneBy(name='hppa')
 
-    >>> a_builder = builderset.new(
-    ...     i386, url='http://hamburger', name="hamburger",
-    ...     title="The Hamburger Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=True)
-
-    >>> a_builder = builderset.new(
-    ...     hppa, url='http://cheese', name="cheese",
-    ...     title="The Cheese Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=True)
-
-    >>> a_builder = builderset.new(
-    ...     amd64, url='http://bacon', name="bacon",
-    ...     title="The Bacon Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=True)
-
-    >>> a_builder = builderset.new(
-    ...     i386, url='http://egg', name="egg",
-    ...     title="The Egg Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=False)
-
-    >>> a_builder = builderset.new(
-    ...     hppa, url='http://ham', name="ham",
-    ...     title="The Ham Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=False)
-
-    >>> a_builder = builderset.new(
-    ...     amd64, url='http://prosciuto', name="prosciuto",
-    ...     title="The Prosciuto Builder", description="Uhmmm", owner=cprov,
-    ...     virtualized=False)
+    >>> ignored = factory.makeBuilder(
+    ...     name='hamburger', processor=i386, virtualized=True)
+    >>> ignored = factory.makeBuilder(
+    ...     name='cheese', processor=hppa, virtualized=True)
+    >>> ignored = factory.makeBuilder(
+    ...     name='bacon', processor=amd64, virtualized=True)
+    >>> ignored = factory.makeBuilder(
+    ...     name='egg', processor=i386, virtualized=False)
+    >>> ignored = factory.makeBuilder(
+    ...     name='ham', processor=hppa, virtualized=False, manual=True)
+    >>> ignored = factory.makeBuilder(
+    ...     name='prosciuto', processor=amd64, virtualized=False)
 
 Newly created builders will be in manual mode because we don't want
 them going straight into the build farm until tested.
 
-    >>> a_builder.manual
+    >>> ham = builderset.getByName('ham')
+    >>> ham.manual
     True
 
 The 'Other' builder category is a `BuilderCategory` class, which

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builder-page.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2012-03-07 05:16:26 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2012-05-29 22:37:30 +0000
@@ -40,8 +40,8 @@
     Updated on ...
 
 The anonymous user can see the builder details portlet and it contains
-information about the builder itself, like name, architecture,
-location and description.
+information about the builder itself, like name, architecture and
+location.
 
     >>> print extract_text(
     ...     find_portlet(anon_browser.contents, 'Builder information'))
@@ -86,8 +86,6 @@
     'bob'
     >>> cprov_browser.getControl(name="field.title").value
     'Bob The Builder'
-    >>> cprov_browser.getControl(name="field.description").value
-    'The default build-slave'
     >>> cprov_browser.getControl(name="field.processor").value
     ['386']
     >>> cprov_browser.getControl(name="field.owner").value

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2012-03-07 05:16:26 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2012-05-29 22:37:30 +0000
@@ -129,12 +129,11 @@
     >>> print admin_browser.title
     Register a new...
 
-Registering a new builder involves setting its name, title,
-description and corresponding location.
+Registering a new builder involves setting its name, title and corresponding
+location.
 
     >>> admin_browser.getControl('Name').value = 'tubaina'
     >>> admin_browser.getControl('Title').value = 'Tubaina'
-    >>> admin_browser.getControl('Description').value = 'Bogus'
     >>> admin_browser.getControl(
     ...     'URL').value = 'http://tubaina.buildd'
 

=== modified file 'lib/lp/soyuz/stories/webservice/xx-builders.txt'
--- lib/lp/soyuz/stories/webservice/xx-builders.txt	2010-10-26 16:51:20 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builders.txt	2012-05-29 22:37:30 +0000
@@ -29,7 +29,6 @@
     ...
     active
     builderok
-    description
     failnotes
     failure_count
     manual

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2012-04-06 23:20:43 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2012-05-29 22:37:30 +0000
@@ -15,7 +15,6 @@
 from zope.security.proxy import removeSecurityProxy
 
 from lp.buildmaster.enums import BuildStatus
-from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.buildmaster.interfaces.packagebuild import IPackageBuild
 from lp.buildmaster.model.builder import BuilderSlave
@@ -478,11 +477,10 @@
         owner = self.factory.makePerson()
         processor_family = ProcessorFamilySet().getByProcessorName('386')
         processor = processor_family.processors[0]
-        builder_set = getUtility(IBuilderSet)
 
-        self.builder = builder_set.new(
+        self.builder = self.factory.makeBuilder(
             processor, 'http://example.com', 'Newbob', 'New Bob the Builder',
-            'A new and improved bob.', owner)
+            owner=owner)
 
         # Ensure that our builds were all built by the test builder.
         for build in self.builds:

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-05-25 01:48:31 +0000
+++ lib/lp/testing/factory.py	2012-05-29 22:37:30 +0000
@@ -2743,8 +2743,8 @@
         return person
 
     def makeBuilder(self, processor=None, url=None, name=None, title=None,
-                    description=None, owner=None, active=True,
-                    virtualized=True, vm_host=None, manual=False):
+                    owner=None, active=True, virtualized=True, vm_host=None,
+                    manual=False):
         """Make a new builder for i386 virtualized builds by default.
 
         Note: the builder returned will not be able to actually build -
@@ -2760,14 +2760,12 @@
             name = self.getUniqueString('builder-name')
         if title is None:
             title = self.getUniqueString('builder-title')
-        if description is None:
-            description = self.getUniqueString('description')
         if owner is None:
             owner = self.makePerson()
 
         return getUtility(IBuilderSet).new(
-            processor, url, name, title, description, owner, active,
-            virtualized, vm_host, manual=manual)
+            processor, url, name, title, owner, active, virtualized, vm_host,
+            manual=manual)
 
     def makeRecipeText(self, *branches):
         if len(branches) == 0: