From 477009d255b1324b35af63b46623989f8d873cc4 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Apr 2016 14:52:01 -0700 Subject: [PATCH] Fix remaining bugs, we're back to 100% green WOO --- releases/__init__.py | 6 +++--- releases/models.py | 2 +- tests/organization.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/releases/__init__.py b/releases/__init__.py index 0bc224f..37d8304 100644 --- a/releases/__init__.py +++ b/releases/__init__.py @@ -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) diff --git a/releases/models.py b/releases/models.py index e9e84f3..7d4ecc0 100644 --- a/releases/models.py +++ b/releases/models.py @@ -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: diff --git a/tests/organization.py b/tests/organization.py index 8676619..154a0f7 100644 --- a/tests/organization.py +++ b/tests/organization.py @@ -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)