Fix remaining bugs, we're back to 100% green WOO

This commit is contained in:
Jeff Forcier 2016-04-27 14:52:01 -07:00
parent 800f12a61e
commit 477009d255
3 changed files with 6 additions and 6 deletions

View file

@ -221,9 +221,9 @@ def construct_entry_with_release(focus, issues, lines, log, releases, rest):
# Regular bugfix: remove from bucket for this release's
# line + unreleased_bugfix
else:
log("Removing #%s from unreleased" % obj.number)
lines[focus.family]['unreleased_bugfix'].remove(obj)
# TODO: why wouldn't it be in the bucket??
if obj in lines[focus.family]['unreleased_bugfix']:
log("Removing #%s from unreleased" % obj.number)
lines[focus.family]['unreleased_bugfix'].remove(obj)
if obj in lines[focus.family][focus.line]:
log("Removing #%s from %s" % (obj.number, focus.line))
lines[focus.family][focus.line].remove(obj)

View file

@ -86,7 +86,7 @@ class Issue(nodes.Element):
bugfix_buckets = [str(x) for x in spec.filter(candidates)]
# Add back in unreleased_* as appropriate
# TODO: probably leverage Issue subclasses for this eventually?
if self.type == 'bug' or self.backported:
if (self.type == 'bug' and not self.major) or self.backported:
buckets.extend(bugfix_buckets)
buckets.append('unreleased_bugfix')
if self.type != 'bug' or self.major:

View file

@ -177,9 +177,9 @@ class organization(Spec):
assert f2 in rendered['1.1.0']
assert f1 not in rendered['1.1.0']
# unreleased feature list should still get/see feature 1
assert f1 in rendered['unreleased_feature']
assert f1 in rendered['unreleased_1.x_feature']
# now-released feature 2 should not be in unreleased_feature
assert f2 not in rendered['unreleased_feature']
assert f2 not in rendered['unreleased_1.x_feature']
def explicit_bugfix_releases_get_removed_from_unreleased(self):
b1 = b(1)