launchpad-reviewers team mailing list archive

[Yuliy Schwartzburg <mp+488444@xxxxxxxxxxxxxxxxxx>]

Added a comment. Also I think we still should increase the timeout anyway because it seems the default one is not sufficient in most cases.

Diff comments:

> diff --git a/lib/lp/code/tests/helpers.py b/lib/lp/code/tests/helpers.py
> index 63e28a6..7ed3044 100644
> --- a/lib/lp/code/tests/helpers.py
> +++ b/lib/lp/code/tests/helpers.py
> @@ -384,7 +384,7 @@ class GitHostingFixture(fixtures.Fixture):
>              result=({} if merges is None else merges)
>          )
>          self.merge = fake_method_factory(
> -            result=({"merge_commit": "fake-sha1"})
> +            result=({"merge_commit": "fake-sha1", "previously_merged": False})

Why are there two things? If there's a merge commit it means it was previously merged right?

>          )
>          self.getBlob = fake_method_factory(result=blob)
>          self.delete = fake_method_factory()


-- 
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/488444
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad:merge-button/fix-timeouts into launchpad:master.