Merge into main : milestone-filter-by-series : Code : Tarmac

Status:

Rejected

Rejected by:

Adam Collard on 2018-03-27

Proposed branch:

lp://qastaging/~adam-collard/tarmac/milestone-filter-by-series

Merge into:

lp://qastaging/tarmac

Diff against target:

208 lines (+36/-33)

2 files modified

tarmac/plugins/bugresolver.py (+13/-12)
tarmac/plugins/tests/test_bugresolver.py (+23/-21)

To merge this branch:

bzr merge lp://qastaging/~adam-collard/tarmac/milestone-filter-by-series

High

In Progress

Link a bug report

Reviewer	Date Requested	Status
dobey	2015-11-30	Needs Fixing on 2016-01-08
Chris Glass (community)	2015-11-30	Approve on 2015-11-30
Данило Шеган (community)	2015-11-30	Approve on 2015-11-30
Review via email: mp+278946@code.qastaging.launchpad.net

Description of the change

When setting the milestone, only look for milestones which match the series that the bug has been committed on.

Revision history for this message

Данило Шеган (danilo) wrote on 2015-11-30:

#

LGTM (tests, lint all pass as well). FWIW, the default collections batch size LP seems to use is 75 items, so this is needed when you've got more milestones than that.

review: Approve

Revision history for this message

Chris Glass (tribaal) wrote on 2015-11-30:

#

+1 !

review: Approve

lp://qastaging/~adam-collard/tarmac/milestone-filter-by-series updated on 2015-12-02

435. By Adam Collard on 2015-12-02: No need to walk next_collection links

Revision history for this message

dobey (dobey) wrote on 2016-01-08:

#

Download full text (10.2 KiB)

Running the tests with ./run-tests in the tree on my 14.04 system, There are 2 failures and 9 errors:

======================================================================
ERROR: test__find_milestone_no_dates (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_no_dates
----------------------------------------------------------------------
_StringException: Empty attachments:
log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 233, in test__find_milestone_no_dates
    milestones = list(self.plugin._find_milestones(self.series[1]))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 116, in _find_milestones
    if milestone.name == default:
AttributeError: 'int' object has no attribute 'name'

======================================================================
ERROR: test__find_milestone_specific_negative (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_specific_negative
----------------------------------------------------------------------
_StringException: Empty attachments:
log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 226, in test__find_milestone_specific_negative
    milestones = list(self.plugin._find_milestones(self.series[0]))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 116, in _find_milestones
    if milestone.name == default:
AttributeError: 'int' object has no attribute 'name'

======================================================================
ERROR: test__find_target_milestone_between (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_between
----------------------------------------------------------------------
_StringException: Empty attachments:
log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 184, in test__find_target_milestone_between
    self.milestone_past.date_targeted + timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test__find_target_milestone_lexical_sort_past_dates (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_lexical_sort_past_dates
----------------------------------------------------------------------
_StringException: Empty attachments:
log

Traceback (most recent call last):
File "/home/dobey/Projects/canonical/tar...

Running the tests with ./run-tests in the tree on my 14.04 system, There are 2 failures and 9 errors:

======================================================================
ERROR: test__find_milestone_no_dates (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_no_dates
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 233, in test__find_milestone_no_dates
    milestones = list(self.plugin._find_milestones(self.series[1]))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 116, in _find_milestones
    if milestone.name == default:
AttributeError: 'int' object has no attribute 'name'

======================================================================
ERROR: test__find_milestone_specific_negative (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_specific_negative
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 226, in test__find_milestone_specific_negative
    milestones = list(self.plugin._find_milestones(self.series[0]))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 116, in _find_milestones
    if milestone.name == default:
AttributeError: 'int' object has no attribute 'name'

======================================================================
ERROR: test__find_target_milestone_between (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_between
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 184, in test__find_target_milestone_between
    self.milestone_past.date_targeted + timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test__find_target_milestone_lexical_sort_past_dates (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_lexical_sort_past_dates
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 200, in test__find_target_milestone_lexical_sort_past_dates
    self.milestone_far_future.date_targeted + timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test__find_target_milestone_newer (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_newer
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 193, in test__find_target_milestone_newer
    self.milestone_far_future.date_targeted + timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test__find_target_milestone_older (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_older
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 177, in test__find_target_milestone_older
    self.milestone_past.date_targeted - timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test__find_target_milestone_with_default (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_target_milestone_with_default
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 208, in test__find_target_milestone_with_default
    self.milestone_far_future.date_targeted + timedelta(weeks=1))
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 139, in _find_target_milestone
    milestones = self._find_milestones(series)
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 116, in _find_milestones
    if milestone.name == default:
AttributeError: 'int' object has no attribute 'name'

======================================================================
ERROR: test__set_milestone_on_task_config_set (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__set_milestone_on_task_config_set
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 303, in test__set_milestone_on_task_config_set
    self.series[0], self.bugs['0'].bug_tasks[0])
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 100, in _set_milestone_on_task
    target_milestone = self._find_target_milestone(series, now)
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
ERROR: test_run_with_set_milestone (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run_with_set_milestone
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 127, in test_run_with_set_milestone
    proposal=self.proposal)
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 60, in run
    self._set_milestone_on_task(series, task)
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 100, in _set_milestone_on_task
    target_milestone = self._find_target_milestone(series, now)
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/bugresolver.py", line 142, in _find_target_milestone
    if milestone.date_targeted is None:
AttributeError: 'int' object has no attribute 'date_targeted'

======================================================================
FAIL: test__find_milestone_negative (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_negative
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 220, in test__find_milestone_negative
    self.assertEqual(len(milestones), 0)
  File "/usr/lib/python2.7/dist-packages/bzrlib/tests/__init__.py", line 1360, in assertEqual
    pprint.pformat(a), pprint.pformat(b)))
AssertionError: not equal:
a = 2
b = 0

======================================================================
FAIL: test__find_milestone_positive (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test__find_milestone_positive
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/dobey/Projects/canonical/tarmac/milestone-filter-by-series/tarmac/plugins/tests/test_bugresolver.py", line 214, in test__find_milestone_positive
    self.assertEqual(len(milestones), 7)
  File "/usr/lib/python2.7/dist-packages/bzrlib/tests/__init__.py", line 1360, in assertEqual
    pprint.pformat(a), pprint.pformat(b)))
AssertionError: not equal:
a = 2
b = 7

----------------------------------------------------------------------
Ran 120 tests in 62.464s

FAILED (failures=2, errors=9)

review: Needs Fixing

Unmerged revisions

435. By Adam Collard on 2015-12-02: No need to walk next_collection links
434. By Adam Collard on 2015-11-30: fix lint
433. By Adam Collard on 2015-11-30: Filter by series

Tarmac

Merge lp://qastaging/~adam-collard/tarmac/milestone-filter-by-series into lp://qastaging/tarmac

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers