Ubuntu Pastebin

Paste from cjwatson at Thu, 1 Sep 2016 19:05:42 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
=== modified file 'bileto/worker/merge.py'
--- bileto/worker/merge.py	2016-08-15 20:47:30 +0000
+++ bileto/worker/merge.py	2016-09-01 19:05:27 +0000
@@ -230,7 +230,7 @@ class Merge(Package):
         for merge in self.merges:
             full = (merge.commit_message or EMPTY).strip()
             short = (full or N).splitlines()[0].strip(' -*')
-            bugs = format_bugs(merge.source_branch.linked_bugs)
+            bugs = format_bugs(merge.bugs)
             approvers = identify_approvers(merge)
             authors = yield from VCS.merge(
                 merge.source_branch.web_link,

=== modified file 'tests/test_worker_merge.py'
--- tests/test_worker_merge.py	2016-08-17 20:51:15 +0000
+++ tests/test_worker_merge.py	2016-09-01 19:05:37 +0000
@@ -68,10 +68,10 @@ class MergeTestCase(WorkerTestCase):
         bug2.id = 654321
         self.mp = Mock()
         self.mp.commit_message = 'Fix bug #NNNNNN'
+        self.mp.bugs = [bug1, bug2]
         self.mp.target_branch.display_name = 'lp:ofono'
         self.mp.target_branch.project.name = 'ofono'
         self.mp.source_branch.web_link = 'http://mp'
-        self.mp.source_branch.linked_bugs = [bug1, bug2]
         self.mp.all_comments = [
             Mock(author=Mock(display_name='Al'), vote='Approve'),
             Mock(author=Mock(display_name='Bo'), vote=''),
Download as text