launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/testfix-bzr-webhooks into lp:launchpad.

Commit message:
Fix test failures in bzr-webhooks.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/testfix-bzr-webhooks/+merge/272823

Fix test failures in bzr-webhooks.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/testfix-bzr-webhooks into lp:launchpad.

=== modified file 'lib/lp/code/stories/webservice/xx-branch.txt'
--- lib/lp/code/stories/webservice/xx-branch.txt	2015-04-19 12:56:32 +0000
+++ lib/lp/code/stories/webservice/xx-branch.txt	2015-09-29 17:07:09 +0000
@@ -144,6 +144,7 @@
     unique_name: u'~eric/fooix/trunk'
     url: None
     web_link: u'http://code.../~eric/fooix/trunk'
+    webhooks_collection_link: u'http://.../~eric/fooix/trunk/webhooks'
     whiteboard: None
 
 There is a branch merge proposal with Fooix trunk as the target branch, so it

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuild.py'
--- lib/lp/translations/tests/test_translationtemplatesbuild.py	2014-06-26 07:24:20 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuild.py	2015-09-29 17:07:09 +0000
@@ -184,7 +184,7 @@
         commit = DirectBranchCommit(branch)
         commit.writeFile('POTFILES.in', 'foo')
         commit.commit('message')
-        notify(events.TipChanged(branch, None, False))
+        notify(events.TipChanged(branch, commit.bzrbranch, False))
         self.assertEqual(
             1, TranslationTemplatesBuild.findByBranch(branch).count())