Merge lp:~adeuring/launchpad/bug-333531-bug-status-expired into lp:launchpad

[Abel Deuring]

This branch adds a new bug status "expired" and changes the bug expiry script to set the status of bugs considered to be expired to this status.

Why the integer value 19 for the new status? The method BugTask.transitionToStatus() assumes that the status values have a "workflow related" ordering. For instance, if the old status is "lower" than CONFIRMED and the new status is "greater or equal" to CONFIRMED, date_confirmed is set to the current time. A similar logic exists for other statuses like TRIAGED, INPROGRESS etc.

The value 19 keeps the new status "below" those statuses for which a date is implicitly set.

Aside from the obvious change of the bug expiry script I changed the classes BugTaskEditView and BugTaskTableRowView so that the status value "expired" cannot be selected in the web UI: This status should only be set by the expiry script.

tests:

./bin/test -vvt test_bugtask
./bin/test -vvt bugtask-expiration.txt

lint: lots of noise but nothing related to my changes, I think.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/bugs/browser/bugtask.py
  lib/lp/bugs/browser/tests/test_bugtask.py
  lib/lp/bugs/doc/bugtask-expiration.txt
  lib/lp/bugs/interfaces/bugtask.py
  lib/lp/bugs/scripts/bugexpire.py

== Pylint notices ==

lib/lp/bugs/browser/bugtask.py
    77: [F0401] Unable to import 'z3c.ptcompat' (No module named z3c.ptcompat)
    78: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    79: [F0401] Unable to import 'lazr.enum' (No module named enum)
    81: [F0401] Unable to import 'lazr.lifecycle.event' (No module named lifecycle)
    82: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    83: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    84: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)
    88: [F0401] Unable to import 'canonical.config' (No module named canonical.config)
    90: [F0401] Unable to import 'canonical.launchpad' (No module named canonical.launchpad)
    91: [F0401] Unable to import 'canonical.cachedproperty' (No module named canonical.cachedproperty)
    92: [F0401] Unable to import 'canonical.launchpad.fields' (No module named canonical.launchpad.fields)
    93: [F0401] Unable to import 'canonical.launchpad.mailnotification' (No module named canonical.launchpad.mailnotification)
    94: [F0401] Unable to import 'canonical.launchpad.validators' (No module named canonical.launchpad.validators)
    95: [F0401] Unable to import 'canonical.launchpad.webapp' (No module named canonical.launchpad.webapp)
    99: [F0401] Unable to import 'canonical.lazr.utils' (No module named canonical.lazr.utils)
    101: [F0401] Unable to import 'lp.answers.interfaces.questiontarget' (No module named lp.answers.interfaces.questiontarget)
    102: [F0401] Unable to import 'lp.bugs.interfaces.bugattachment' (No module named lp.bugs.interfaces.bugattachment)
    104: [F0401] Unable to import 'lp.bugs.interfaces.bugactivity' (No module named lp.bugs.interfaces.bugactivity)
    105: [F0401] Unable to import 'lp.bugs.interfaces.bugnomination' (No module named lp.bugs.interfaces.bugnomination)
    107: [F0401] Unable to import 'lp.bugs.interfaces.bug' (No module named lp.bugs.interfaces.bug)
    108: [F0401] Unable to import 'lp.bugs.interfaces.bugtask' (No module named lp.bugs.interfaces.bugtask)
    117: [F0401] Unable to import 'lp.bugs.interfaces.bugtracker' (No module named lp.bugs.interfaces.bugtracker)
    118: [F0401] Unable to import 'lp.bugs.interfaces.cve' (No module named lp.bugs.interfaces.cve)
    119: [F0401] Unable to import 'lp.bugs.interfaces.malone' (No module named lp.bugs.interfaces.malone)
    120: [F0401] Unable to import 'lp.registry.interfaces.distribution' (No module named lp.registry.interfaces.distribution)
    121: [F0401] Unable to import 'lp.registry.interfaces.distributionsourcepackage' (No module named lp.registry.interfaces.distributionsourcepackage)
    123: [F0401] Unable to import 'lp.registry.interfaces.distroseries' (No module named lp.registry.interfaces.distroseries)
    124: [F0401] Unable to import 'canonical.launchpad.interfaces.launchpad' (No module named canonical.launchpad.interfaces.launchpad)
    126: [F0401] Unable to import 'lp.registry.interfaces.person' (No module named lp.registry.interfaces.person)
    127: [F0401] Unable to import 'lp.registry.interfaces.product' (No module named lp.registry.interfaces.product)
    128: [F0401] Unable to import 'lp.registry.interfaces.productseries' (No module named lp.registry.interfaces.productseries)
    129: [F0401] Unable to import 'lp.registry.interfaces.projectgroup' (No module named lp.registry.interfaces.projectgroup)
    130: [F0401] Unable to import 'lp.registry.interfaces.sourcepackage' (No module named lp.registry.interfaces.sourcepackage)
    131: [F0401] Unable to import 'canonical.launchpad.interfaces.validation' (No module named canonical.launchpad.interfaces.validation)
    133: [F0401] Unable to import 'canonical.launchpad.webapp.breadcrumb' (No module named canonical.launchpad.webapp.breadcrumb)
    134: [F0401] Unable to import 'canonical.launchpad.webapp.interfaces' (No module named canonical.launchpad.webapp.interfaces)
    137: [F0401] Unable to import 'canonical.launchpad.searchbuilder' (No module named canonical.launchpad.searchbuilder)
    139: [F0401] Unable to import 'canonical.launchpad' (No module named canonical.launchpad)
    141: [F0401] Unable to import 'lp.bugs.browser.bug' (No module named lp.bugs.browser.bug)
    142: [F0401] Unable to import 'lp.bugs.browser.bugcomment' (No module named lp.bugs.browser.bugcomment)
    143: [F0401] Unable to import 'canonical.launchpad.browser.feeds' (No module named canonical.launchpad.browser.feeds)
    145: [F0401] Unable to import 'lp.registry.browser.mentoringoffer' (No module named lp.registry.browser.mentoringoffer)
    146: [F0401] Unable to import 'canonical.launchpad.browser.launchpad' (No module named canonical.launchpad.browser.launchpad)
    148: [F0401] Unable to import 'canonical.launchpad.webapp.authorization' (No module named canonical.launchpad.webapp.authorization)
    149: [F0401] Unable to import 'canonical.launchpad.webapp.batching' (No module named canonical.launchpad.webapp.batching)
    150: [F0401] Unable to import 'canonical.launchpad.webapp.menu' (No module named canonical.launchpad.webapp.menu)
    151: [F0401] Unable to import 'canonical.launchpad.webapp.tales' (No module named canonical.launchpad.webapp.tales)
    154: [F0401] Unable to import 'canonical.lazr.interfaces' (No module named canonical.lazr.interfaces)
    155: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)
    157: [F0401] Unable to import 'canonical.widgets.bug' (No module named canonical.widgets.bug)
    158: [F0401] Unable to import 'canonical.widgets.bugtask' (No module named canonical.widgets.bugtask)
    162: [F0401] Unable to import 'canonical.widgets.itemswidgets' (No module named canonical.widgets.itemswidgets)
    163: [F0401] Unable to import 'canonical.widgets.lazrjs' (No module named canonical.widgets.lazrjs)
    166: [F0401] Unable to import 'canonical.widgets.project' (No module named canonical.widgets.project)
    168: [F0401] Unable to import 'lp.registry.vocabularies' (No module named lp.registry.vocabularies)
    1196: [E1002, BugTaskEditView.initialize] Use super on an old style class
    1293: [E1002, BugTaskEditView.setUpFields] Use super on an old style class
    3817: [E1002, BugTaskBreadcrumb.__init__] Use super on an old style class

lib/lp/bugs/browser/tests/test_bugtask.py
    12: [F0401] Unable to import 'canonical.launchpad.ftests' (No module named canonical.launchpad.ftests)
    13: [F0401] Unable to import 'canonical.launchpad.testing.systemdocs' (No module named canonical.launchpad.testing.systemdocs)
    15: [F0401] Unable to import 'canonical.launchpad.webapp.servers' (No module named canonical.launchpad.webapp.servers)
    16: [F0401] Unable to import 'canonical.testing' (No module named canonical.testing)
    18: [F0401] Unable to import 'lp.bugs.browser' (No module named lp.bugs.browser)
    19: [F0401] Unable to import 'lp.bugs.browser.bugtask' (No module named lp.bugs.browser.bugtask)
    21: [F0401] Unable to import 'lp.bugs.interfaces.bugtask' (No module named lp.bugs.interfaces.bugtask)
    22: [F0401] Unable to import 'lp.testing' (No module named lp.testing)
    29: [E1002, TestBugTasksAndNominationsView.setUp] Use super on an old style class
    218: [E1002, TestBugTaskEditViewStatusField.setUp] Use super on an old style class

lib/lp/bugs/interfaces/bugtask.py
    54: [F0401] Unable to import 'lazr.enum' (No module named enum)
    57: [F0401] Unable to import 'canonical.launchpad' (No module named canonical.launchpad)
    58: [F0401] Unable to import 'canonical.launchpad.fields' (No module named canonical.launchpad.fields)
    61: [F0401] Unable to import 'lp.bugs.interfaces.bugwatch' (No module named lp.bugs.interfaces.bugwatch)
    63: [F0401] Unable to import 'lp.soyuz.interfaces.component' (No module named lp.soyuz.interfaces.component)
    64: [F0401] Unable to import 'canonical.launchpad.interfaces.launchpad' (No module named canonical.launchpad.interfaces.launchpad)
    65: [F0401] Unable to import 'lp.registry.interfaces.mentoringoffer' (No module named lp.registry.interfaces.mentoringoffer)
    66: [F0401] Unable to import 'canonical.launchpad.searchbuilder' (No module named canonical.launchpad.searchbuilder)
    67: [F0401] Unable to import 'canonical.launchpad.validators' (No module named canonical.launchpad.validators)
    68: [F0401] Unable to import 'canonical.launchpad.validators.name' (No module named canonical.launchpad.validators.name)
    69: [F0401] Unable to import 'canonical.launchpad.webapp.interfaces' (No module named canonical.launchpad.webapp.interfaces)
    70: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    71: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    76: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    1097: [F0401, BugTaskSearchParams.setSourcePackage] Unable to import 'lp.registry.interfaces.sourcepackage' (No module named lp.registry.interfaces.sourcepackage)
    1162: [F0401, BugTaskSearchParams.fromSearchForm] Unable to import 'lp.bugs.interfaces.bugattachment' (No module named lp.bugs.interfaces.bugattachment)
    1212: [C0322, BugTaskSearchParams.fromSearchForm] Operator not preceded by a space
    search_params.linked_branches=linked_branches
    ^

lib/lp/bugs/scripts/bugexpire.py
    17: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    19: [F0401] Unable to import 'canonical.config' (No module named canonical.config)
    20: [F0401] Unable to import 'lazr.lifecycle.event' (No module named lifecycle)
    21: [F0401] Unable to import 'canonical.launchpad.interfaces.launchpad' (No module named canonical.launchpad.interfaces.launchpad)
    22: [F0401] Unable to import 'lp.bugs.interfaces.bugtask' (No module named lp.bugs.interfaces.bugtask)
    23: [F0401] Unable to import 'canonical.launchpad.webapp.interfaces' (No module named canonical.launchpad.webapp.interfaces)
    24: [F0401] Unable to import 'canonical.launchpad.webapp.interaction' (No module named canonical.launchpad.webapp.interaction)

[Gavin Panella (allenap)]

Looks good :)

The conversation we had on IRC:

<allenap> adeuring: Is there going to be another branch (or two) to add a date_expired field to IBugTask?
<adeuring> allenap: argh... i forgot completely about that...
<adeuring> yes, there _should_ be a branch...
<allenap> adeuring: I think the bug number in the branch name is wrong.
<adeuring> allenap: right...
<allenap> adeuring: Line 75, could you login(product_owner) to avoid the removeSecurityProxy() call?
<allenap> adeuring: Or even login_person(product_owner)
<adeuring> allenap: in theory, yes. Problem that things become then more complicated: the owner can't assign another person as the supervisor, so I need to create a team, let another person join that team and finally run the test with that other user
<adeuring> allenap: I was too lazy to do all that ;)
<allenap> adeuring: Argh. Leave it then :)
<adeuring> allenap: OK ;)
<allenap> adeuring: Perhaps the removeSecurityProxy() hack could be put in LaunchpadObjectFactory.makeProduct(..., bug_supervisor=None).
<adeuring> allenap: right, good idea!
<allenap> adeuring: Line 124, the bug supervisor or the product owner should be able to call transitionToStatus(), so consider using that rather than removing the proxy.
<adeuring> allenap: right
<allenap> adeuring: 136s/Epired/Expired/
<adeuring> allenap: fixed
<allenap> adeuring: One last thing. There's probably some doc test out there that does a similar thing to TestBugTaskEditViewStatusField. If you know where, consider removing it.
<adeuring> allenap: I did not find anything like that...
<adeuring> that's why I added it ;)

review: Approve

[Robert Collins (lifeless)]

Can API's set the new status of expired? This is something that custom user
tools would be great at using.

[Gavin Panella (allenap)]

> Can API's set the new status of expired?

I can't see a reason why not, subject to the same access control, but I also haven't checked it. Something for QA I reckon.

[Abel Deuring (adeuring)]

On 15.04.2010 10:32, Gavin Panella wrote:
>> Can API's set the new status of expired?
>
> I can't see a reason why not, subject to the same access control, but I also haven't checked it. Something for QA I reckon.
>

Just tried it locally: yes, it is possible to set a bug task to
"expired" via the API, provided that you have enough privileges. You can
also set this status via email. But this uncovered a problem: Everyvbody
can set this status via email. It should be limited to the same persons
 which can set it via the API (project owner and bug supervisor)...

[Abel Deuring (adeuring)]

I added the status EXPIRED to the set of statuses that only project owners and bug supervisors can change. This prevents the problems I mentioned.

diff of the changes since the last review (includes replacement of makePersonNoCommit() by makePerson() -- the former method disappeared...)

review: Needs Resubmitting

[Abel Deuring (adeuring)]

...here is the diff:

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py 2010-04-14 15:51:13 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py 2010-04-15 10:38:07 +0000
@@ -217,10 +217,9 @@

     def setUp(self):
         super(TestBugTaskEditViewStatusField, self).setUp()
- product_owner = self.factory.makePersonNoCommit(name='product-owner')
- bug_supervisor = self.factory.makePersonNoCommit(
- name='bug-supervisor')
- product = self.factory.makeProductNoCommit(
+ product_owner = self.factory.makePerson(name='product-owner')
+ bug_supervisor = self.factory.makePerson(name='bug-supervisor')
+ product = self.factory.makeProduct(
             owner=product_owner, bug_supervisor=bug_supervisor)
         self.bug = self.factory.makeBug(product=product)

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py 2010-04-14 13:23:02 +0000
+++ lib/lp/bugs/interfaces/bugtask.py 2010-04-15 13:08:31 +0000
@@ -317,6 +317,7 @@

 BUG_SUPERVISOR_BUGTASK_STATUSES = (
     BugTaskStatus.WONTFIX,
+ BugTaskStatus.EXPIRED,
     BugTaskStatus.TRIAGED)

 DEFAULT_SEARCH_BUGTASK_STATUSES = (

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt 2009-08-13 15:12:16 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt 2010-04-15 14:00:55 +0000
@@ -1374,6 +1374,11 @@
     >>> print upstream_task.status.title
     Won't Fix

+ >>> submit_commands(bug_four, 'status expired')
+ >>> sync(upstream_task)
+ >>> print upstream_task.status.title
+ Expired
+
 Everyone else gets an explanatory error message:

     >>> from canonical.launchpad.interfaces import BugTaskStatus
@@ -1400,6 +1405,19 @@
     registrant or a bug supervisor for Mozilla Firefox.
     ...

+ >>> submit_commands(bug_four, 'affects firefox', 'status expired')
+ >>> print_latest_email()
+ Subject: Submit Request Failure
+ To: <email address hidden>
+ <BLANKLINE>
+ ...
+ Failing command:
+ status expired
+ ...
+ The status cannot be changed to expired because you are not the
+ registrant or a bug supervisor for Mozilla Firefox.
+ ...
+
 Let's take a look at all the other error messages that the sub
 commands can produce.

@@ -1417,7 +1435,7 @@
         status foo
     ...
     The 'status' command expects any of the following arguments:
- new, incomplete, invalid, wontfix, confirmed, triaged, inprogress, fixcommitted, fixreleased
+ new, incomplete, invalid, wontfix, expired, confirmed, triaged, inprogress, fixcommitted, fixreleased
     <BLANKLINE>
     For example:
     <BLANKLINE>

=== modified file 'lib/lp/bugs/tests/bugtarget-bugcount.txt'
--- lib/lp/bugs/tests/bugtarget-bugcount.txt 2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/tests/bugtarget-bugcount.txt 2010-04-15 11:46:39 +0000
@@ -13,6 +13,7 @@
     INCOMPLETE
     INVALID
     WONTFIX
+ EXPIRED
     CONFIRMED
     TRIAGED
     INPROGRESS
@@ -55,6 +56,7 @@
     INCOMPLETE: 5 bug(s) more
     INVALID: 5 bug(s) more
     WONTFIX: 5 bug(s) more
+ EXPIRED: 5 bug(s) more
     CONFIRMED: 5 ...

[Gavin Panella (allenap)]

Good catch on the email interface. The diff looks good.

review: Approve

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-04-05 21:10:31 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-04-16 11:43:29 +0000
@@ -1302,10 +1302,11 @@
         # it uses based on the permissions of the user viewing form.
         if 'status' in self.editable_field_names:
             if self.user is None:
-                status_noshow = list(BugTaskStatus.items)
+                status_noshow = set(BugTaskStatus.items)
             else:
-                status_noshow = [BugTaskStatus.UNKNOWN]
-                status_noshow.extend(
+                status_noshow = set((
+                    BugTaskStatus.UNKNOWN, BugTaskStatus.EXPIRED))
+                status_noshow.update(
                     status for status in BugTaskStatus.items
                     if not self.context.canTransitionToStatus(
                         status, self.user))
@@ -2564,7 +2565,7 @@
                 dict(
                     value=term.token, title=term.title or term.token,
                     checked=term.value in default_values))
-        return helpers.shortlist(widget_values, longest_expected=10)
+        return helpers.shortlist(widget_values, longest_expected=11)
 
     def getStatusWidgetValues(self):
         """Return data used to render the status checkboxes."""
@@ -3344,7 +3345,8 @@
             # the title as the token for backwards compatibility.
             status_items = [
                 (item.title, item) for item in BugTaskStatus.items
-                if item != BugTaskStatus.UNKNOWN]
+                if item not in (BugTaskStatus.UNKNOWN,
+                                BugTaskStatus.EXPIRED)]
 
             disabled_items = [status for status in BugTaskStatus.items
                 if not self.context.canTransitionToStatus(status, self.user)]

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2009-12-10 15:48:31 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-04-16 11:43:29 +0000
@@ -6,16 +6,19 @@
 
 import unittest
 
+from zope.security.proxy import removeSecurityProxy
 from zope.testing.doctest import DocTestSuite
 
-from canonical.launchpad.ftests import login
+from canonical.launchpad.ftests import ANONYMOUS, login, login_person
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite, setUp, tearDown)
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import LaunchpadFunctionalLayer
 
 from lp.bugs.browser import bugtask
-from lp.bugs.browser.bugtask import BugTasksAndNominationsView
+from lp.bugs.browser.bugtask import (
+    BugTaskEditView, BugTasksAndNominationsView)
+from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.testing import TestCaseWithFactory
 
 
@@ -205,9 +208,99 @@
             self.view.anon_affected_statement)
 
 
+class TestBugTaskEditViewStatusField(TestCaseWithFactory):
+    """We show only those options as possible value in the status
+    field that the user can select.
+    """
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestBugTaskEditViewStatusField, self).setUp()
+        product_owner = self.factory.makePerson(name='product-owner')
+        bug_supervisor = self.factory.makePerson(name='bug-supervisor')
+        product = self.factory.makeProduct(
+            owner=product_owner, bug_supervisor=bug_supervisor)
+        self.bug = self.factory.makeBug(product=product)
+
+    def getWidgetOptionTitles(self, widget):
+        """Return the titles of options of the given choice widget."""
+        return [
+            item.value.title for item in widget.field.vocabulary]
+
+    def test_status_field_items_for_anonymous(self):
+        # Anonymous users see only the current value.
+        login(ANONYMOUS)
+        view = BugTaskEditView(
+            self.bug.default_bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            ['New'], self.getWidgetOptionTitles(view.form_fields['status']))
+
+    def test_status_field_items_for_ordinary_users(self):
+        # Ordinary users can set the status to all values except Won't fix,
+        # Expired, Triaged, Unknown.
+        login('[e-mail]')
+        view = BugTaskEditView(
+            self.bug.default_bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            ['New', 'Incomplete', 'Invalid', 'Confirmed', 'In Progress',
+             'Fix Committed', 'Fix Released'],
+            self.getWidgetOptionTitles(view.form_fields['status']))
+
+    def test_status_field_privileged_persons(self):
+        # The bug target owner and the bug target supervisor can set
+        # the status to any value except Unknown and Expired.
+        for user in (
+            self.bug.default_bugtask.pillar.owner,
+            self.bug.default_bugtask.pillar.bug_supervisor):
+            login_person(user)
+            view = BugTaskEditView(
+                self.bug.default_bugtask, LaunchpadTestRequest())
+            view.initialize()
+            self.assertEqual(
+                ['New', 'Incomplete', 'Invalid', "Won't Fix", 'Confirmed',
+                 'Triaged', 'In Progress', 'Fix Committed', 'Fix Released'],
+                self.getWidgetOptionTitles(view.form_fields['status']),
+                'Unexpected set of settable status options for %s'
+                % user.name)
+
+    def test_status_field_bug_task_in_status_unknown(self):
+        # If a bugtask has the status Unknown, this status is included
+        # in the options.
+        owner = self.bug.default_bugtask.pillar.owner
+        login_person(owner)
+        self.bug.default_bugtask.transitionToStatus(
+            BugTaskStatus.UNKNOWN, owner)
+        login('[e-mail]')
+        view = BugTaskEditView(
+            self.bug.default_bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            ['New', 'Incomplete', 'Invalid', 'Confirmed', 'In Progress',
+             'Fix Committed', 'Fix Released', 'Unknown'],
+            self.getWidgetOptionTitles(view.form_fields['status']))
+
+    def test_status_field_bug_task_in_status_expired(self):
+        # If a bugtask has the status Expired, this status is included
+        # in the options.
+        removeSecurityProxy(self.bug.default_bugtask).status = (
+            BugTaskStatus.EXPIRED)
+        login('[e-mail]')
+        view = BugTaskEditView(
+            self.bug.default_bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            ['New', 'Incomplete', 'Invalid', 'Expired', 'Confirmed',
+             'In Progress', 'Fix Committed', 'Fix Released'],
+            self.getWidgetOptionTitles(view.form_fields['status']))
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestBugTasksAndNominationsView))
+    suite.addTest(unittest.makeSuite(TestBugTaskEditViewStatusField))
     suite.addTest(DocTestSuite(bugtask))
     suite.addTest(LayeredDocFileSuite(
         'bugtask-target-link-titles.txt', setUp=setUp, tearDown=tearDown,

=== modified file 'lib/lp/bugs/doc/bugtask-expiration.txt'
--- lib/lp/bugs/doc/bugtask-expiration.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/doc/bugtask-expiration.txt	2010-04-16 11:43:29 +0000
@@ -3,7 +3,7 @@
 Old unattended Incomplete bugtasks clutter the search results of
 Launchpad Bugs making the bug staff's job difficult. A script is run
 daily to locate unattended Incomplete bugtasks that have not been
-updated in 2 months, and sets their status to Invalid. Only bugtasks
+updated in 2 months, and sets their status to Expired. Only bugtasks
 for projects that use Launchpad to track bugs and have
 enable_bug_expiration set to True will be expired; this rule does not
 apply to Bugs imported from upstream bug trackers. The preconditions
@@ -17,7 +17,7 @@
 6. The bugtask is not assigned to anyone.
 7. The bugtask does not have a milestone.
 
-Bugtasks cannot transition to Invalid automatically unless they meet
+Bugtasks cannot transition to Expired automatically unless they meet
 all the rules stated above.
 
 
@@ -102,13 +102,13 @@
     True
 
 A bugtask for a product with a bug watch. Note that this bugtask
-has otherwise the same parameters as jokosher_bugtask. The 
+has otherwise the same parameters as jokosher_bugtask. The
 bugwatch prevents expiration, hence this bugtask will not appear
 in the listings of expirable bugtasks below.
 
     >>> from canonical.launchpad.interfaces import IBugTrackerSet
     >>> mozilla_bugtracker = getUtility(IBugTrackerSet)['mozilla.org']
-    >>> jokosher_bugtask_watched = create_old_bug('jokosher watched', 
+    >>> jokosher_bugtask_watched = create_old_bug('jokosher watched',
     ...     61, jokosher, external_bugtracker=mozilla_bugtracker)
     >>> jokosher_bugtask_watched.bug.can_expire
     False
@@ -213,7 +213,7 @@
 
     >>> bugtasks = [ubuntu_bugtask, hoary_bugtask, jokosher_bugtask,
     ...     jokosher_bugtask_watched, new_bugtask, assigned_bugtask,
-    ...     confirmed_bugtask, duplicate_bugtask, external_bugtask, 
+    ...     confirmed_bugtask, duplicate_bugtask, external_bugtask,
     ...     milestone_bugtask, recent_bugtask, no_expiration_bugtask]
 
     >>> from lp.bugs.tests.bug import summarize_bugtasks
@@ -417,11 +417,11 @@
 
 == Running the script ==
 
-There is one Invalid Bugtasks in sampledata, from the tests above.
+There are no Expired Bugtasks in sampledata, from the tests above.
 
     >>> from canonical.launchpad.database import BugTask
-    >>> BugTask.selectBy(status=BugTaskStatus.INVALID).count()
-    1
+    >>> BugTask.selectBy(status=BugTaskStatus.EXPIRED).count()
+    0
 
     >>> # We want to check the hoary bugtask messages later.
     >>> starting_bug_messages_count = (hoary_bugtask.bug.messages.count())
@@ -462,16 +462,16 @@
 
 == After the script has run ==
 
-There are three Invalid bugtasks. Jokosher, hoary and ubuntu were
+There are three Expired bugtasks. Jokosher, hoary and ubuntu were
 expired by the expiration process. Although ubuntu was never returned
 by findExpirableBugTasks(), it was expired because its master (hoary)
 was expired. The remaining bugtasks are unchanged.
 
     >>> summarize_bugtasks(bugtasks)
     ROLE             EXPIRE  AGE  STATUS      ASSIGNED  DUP    MILE   REPLIES
-    ubuntu           False     0  Invalid     False     False  False  False
-    hoary            False     0  Invalid     False     False  False  False
-    jokosher         False     0  Invalid     False     False  False  False
+    ubuntu           False     0  Expired     False     False  False  False
+    hoary            False     0  Expired     False     False  False  False
+    jokosher         False     0  Expired     False     False  False  False
     jokosher watched False    61  Incomplete  False     False  False  False
     thunderbird      False     0  Won't Fix   False     False  False  False
     assigned         False    61  Incomplete  True      False  False  False
@@ -482,17 +482,6 @@
     recent           True     31  Incomplete  False     False  False  False
     no_expire        False    61  Incomplete  False     False  False  False
 
-Only the three test bugtasks were expired in the entire database. The
-evolution task was already Invalid.
-
-    >>> invalid_bugtasks = BugTask.selectBy(status=BugTaskStatus.INVALID)
-    >>> summarize_bugtasks(invalid_bugtasks)
-    ROLE         EXPIRE  AGE  STATUS      ASSIGNED  DUP    MILE   REPLIES
-    ubuntu       False     0  Invalid     False     False  False  False
-    hoary        False     0  Invalid     False     False  False  False
-    jokosher     False     0  Invalid     False     False  False  False
-    evolution    False    61  Invalid     False     False  False  False
-
 The bugtasks statusexplanation was updated to explain the change in
 status.
 
@@ -522,7 +511,7 @@
     >>> print "%s  %s  %s  %s" % (
     ...     activity.person.displayname, activity.whatchanged,
     ...     activity.oldvalue, activity.newvalue)
-    Launchpad Janitor  Ubuntu Hoary: status  Incomplete  Invalid
+    Launchpad Janitor  Ubuntu Hoary: status  Incomplete  Expired
 
 
 == enable_bug_expiration ==

=== modified file 'lib/lp/bugs/doc/bugtask-status-workflow.txt'
--- lib/lp/bugs/doc/bugtask-status-workflow.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-04-16 11:43:29 +0000
@@ -165,7 +165,7 @@
     None
 
 If the status is changed from any unresolved status to any resolved
-status (Invalid or Fix Released), the date_closed property is
+status (Invalid, Expired or Fix Released), the date_closed property is
 set. The date_closed is always set to None when the task's status is
 set to an open status. Note in the transition to FIXRELEASED the
 date_inprogress is also set, when it had previously been None.
@@ -181,6 +181,13 @@
     >>> ubuntu_firefox_task.date_closed is None
     True
 
+    >>> ubuntu_firefox_task.transitionToStatus(
+    ...     BugTaskStatus.EXPIRED, getUtility(ILaunchBag).user)
+    >>> ubuntu_firefox_task.date_closed
+    datetime.datetime...
+
+    >>> ubuntu_firefox_task.transitionToStatus(
+    ...     BugTaskStatus.CONFIRMED, getUtility(ILaunchBag).user)
     >>> ubuntu_firefox_task.date_inprogress is None
     True
     >>> ubuntu_firefox_task.transitionToStatus(

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-04-05 21:42:33 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-04-16 11:43:29 +0000
@@ -171,6 +171,12 @@
         fixing, or it might not be fixed in this release.
         """)
 
+    EXPIRED = DBItem(19, """
+        Expired
+
+        This bug is expired. There was no activity since a longer time.
+        """)
+
     CONFIRMED = DBItem(20, """
         Confirmed
 
@@ -228,7 +234,7 @@
 
     sort_order = (
         'NEW', 'INCOMPLETE_WITH_RESPONSE', 'INCOMPLETE_WITHOUT_RESPONSE',
-        'INCOMPLETE', 'INVALID', 'WONTFIX', 'CONFIRMED', 'TRIAGED',
+        'INCOMPLETE', 'INVALID', 'WONTFIX', 'EXPIRED', 'CONFIRMED', 'TRIAGED',
         'INPROGRESS', 'FIXCOMMITTED', 'FIXRELEASED')
 
     INCOMPLETE_WITH_RESPONSE = DBItem(35, """
@@ -306,10 +312,12 @@
 RESOLVED_BUGTASK_STATUSES = (
     BugTaskStatus.FIXRELEASED,
     BugTaskStatus.INVALID,
-    BugTaskStatus.WONTFIX)
+    BugTaskStatus.WONTFIX,
+    BugTaskStatus.EXPIRED)
 
 BUG_SUPERVISOR_BUGTASK_STATUSES = (
     BugTaskStatus.WONTFIX,
+    BugTaskStatus.EXPIRED,
     BugTaskStatus.TRIAGED)
 
 DEFAULT_SEARCH_BUGTASK_STATUSES = (

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-04-01 21:37:09 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-04-16 11:43:29 +0000
@@ -810,7 +810,8 @@
         if (user.inTeam(self.pillar.bug_supervisor) or
             user.inTeam(self.pillar.owner) or
             user.id == celebrities.bug_watch_updater.id or
-            user.id == celebrities.bug_importer.id):
+            user.id == celebrities.bug_importer.id or
+            user.id == celebrities.janitor.id):
             return True
         else:
             return (self.status is not BugTaskStatus.WONTFIX and

=== modified file 'lib/lp/bugs/scripts/bugexpire.py'
--- lib/lp/bugs/scripts/bugexpire.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/scripts/bugexpire.py	2010-04-16 11:43:29 +0000
@@ -27,7 +27,7 @@
 
 class BugJanitor:
     """Expire Incomplete BugTasks that are older than a configurable period.
-    
+
     The BugTask must be unassigned, and the project it is associated with
     must use Malone for bug tracking.
     """
@@ -80,7 +80,7 @@
                 bugtask_before_modification = Snapshot(
                     bugtask, providing=providedBy(bugtask))
                 bugtask.transitionToStatus(
-                    BugTaskStatus.INVALID, self.janitor)
+                    BugTaskStatus.EXPIRED, self.janitor)
                 content = message_template % (
                     bugtask.bugtargetdisplayname, self.days_before_expiration)
                 bugtask.bug.newMessage(
@@ -105,7 +105,7 @@
 
     def _login(self):
         """Setup an interaction as the bug janitor.
-        
+
         The role of bug janitor is usually played by bug_watch_updater.
         """
         auth_utility = getUtility(IPlacelessAuthUtility)

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-04-16 11:43:29 +0000
@@ -1374,6 +1374,11 @@
     >>> print upstream_task.status.title
     Won't Fix
 
+    >>> submit_commands(bug_four, 'status expired')
+    >>> sync(upstream_task)
+    >>> print upstream_task.status.title
+    Expired
+
 Everyone else gets an explanatory error message:
 
     >>> from canonical.launchpad.interfaces import BugTaskStatus
@@ -1400,6 +1405,19 @@
     registrant or a bug supervisor for Mozilla Firefox.
     ...
 
+    >>> submit_commands(bug_four, 'affects firefox', 'status expired')
+    >>> print_latest_email()
+    Subject: Submit Request Failure
+    To: [e-mail]
+    <BLANKLINE>
+    ...
+    Failing command:
+        status expired
+    ...
+    The status cannot be changed to expired because you are not the
+    registrant or a bug supervisor for Mozilla Firefox.
+    ...
+
 Let's take a look at all the other error messages that the sub
 commands can produce.
 
@@ -1417,7 +1435,7 @@
         status foo
     ...
     The 'status' command expects any of the following arguments:
-    new, incomplete, invalid, wontfix, confirmed, triaged, inprogress, fixcommitted, fixreleased
+    new, incomplete, invalid, wontfix, expired, confirmed, triaged, inprogress, fixcommitted, fixreleased
     <BLANKLINE>
     For example:
     <BLANKLINE>

=== modified file 'lib/lp/bugs/tests/bugtarget-bugcount.txt'
--- lib/lp/bugs/tests/bugtarget-bugcount.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/tests/bugtarget-bugcount.txt	2010-04-16 11:43:29 +0000
@@ -13,6 +13,7 @@
     INCOMPLETE
     INVALID
     WONTFIX
+    EXPIRED
     CONFIRMED
     TRIAGED
     INPROGRESS
@@ -55,6 +56,7 @@
     INCOMPLETE: 5 bug(s) more
     INVALID: 5 bug(s) more
     WONTFIX: 5 bug(s) more
+    EXPIRED: 5 bug(s) more
     CONFIRMED: 5 bug(s) more
     TRIAGED: 5 bug(s) more
     INPROGRESS: 5 bug(s) more

=== modified file 'lib/lp/bugs/tests/test_bugtask_status.txt'
--- lib/lp/bugs/tests/test_bugtask_status.txt	2010-04-01 17:13:37 +0000
+++ lib/lp/bugs/tests/test_bugtask_status.txt	2010-04-16 11:43:29 +0000
@@ -13,8 +13,8 @@
     ...     nopriv_user, 'Test bug', 'Something')
     >>> firefox_bug = firefox.createBug(bug_params)
 
-Bug Supervisors can transition bugs to the Won't Fix and Triaged
-statuses.
+Bug Supervisors can transition bugs to the Won't Fix, Expired and
+Triaged statuses.
 
     >>> [firefox_bugtask] = firefox_bug.bugtasks
     >>> firefox_bugtask.transitionToStatus(
@@ -23,12 +23,17 @@
     Won't Fix
 
     >>> firefox_bugtask.transitionToStatus(
+    ...     BugTaskStatus.EXPIRED, nopriv_user)
+    >>> print firefox_bugtask.status.title
+    Expired
+
+    >>> firefox_bugtask.transitionToStatus(
     ...     BugTaskStatus.TRIAGED, nopriv_user)
     >>> print firefox_bugtask.status.title
     Triaged
 
-The product registrant can transition to the Won't Fix and Triaged
-statuses too.
+The product registrant can transition to the Won't Fix, Expired and
+Triaged statuses too.
 
     >>> firefox_bugtask.transitionToStatus(
     ...     BugTaskStatus.CONFIRMED, nopriv_user)
@@ -44,6 +49,11 @@
     Won't Fix
 
     >>> firefox_bugtask.transitionToStatus(
+    ...     BugTaskStatus.EXPIRED, firefox.owner)
+    >>> print firefox_bugtask.status.title
+    Expired
+
+    >>> firefox_bugtask.transitionToStatus(
     ...     BugTaskStatus.TRIAGED, firefox.owner)
     >>> print firefox_bugtask.status.title
     Triaged
@@ -65,6 +75,12 @@
     UserCannotEditBugTaskStatus: Only Bug Supervisors may change status to Won't Fix.
 
     >>> firefox_bugtask.transitionToStatus(
+    ...     BugTaskStatus.EXPIRED, nopriv_user)
+    Traceback (most recent call last):
+    ...
+    UserCannotEditBugTaskStatus: Only Bug Supervisors may change status to Expired.
+
+    >>> firefox_bugtask.transitionToStatus(
     ...     BugTaskStatus.TRIAGED, nopriv_user)
     Traceback (most recent call last):
     ...

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-04-15 14:38:43 +0000
+++ lib/lp/testing/factory.py	2010-04-16 11:43:29 +0000
@@ -645,7 +645,7 @@
         self, name=None, project=None, displayname=None,
         licenses=None, owner=None, registrant=None,
         title=None, summary=None, official_malone=None,
-        official_rosetta=None):
+        official_rosetta=None, bug_supervisor=None):
         """Create and return a new, arbitrary Product."""
         if owner is None:
             owner = self.makePerson()
@@ -676,6 +676,9 @@
             product.official_malone = official_malone
         if official_rosetta is not None:
             removeSecurityProxy(product).official_rosetta = official_rosetta
+        if bug_supervisor is not None:
+            naked_product = removeSecurityProxy(product)
+            naked_product.bug_supervisor = bug_supervisor
         return product
 
     def makeProductSeries(self, product=None, name=None, owner=None,