launchpad-reviewers team mailing list archive

[Ines Almeida <mp+488444@xxxxxxxxxxxxxxxxxx>]

I can look into the timeout in a separate proposal, I'd probably like to test it in qastaging separately. I have a separate branch with a commit that adds the timeout as a feature flag that we can change. But if the timeout is already at 30 seconds (the default) it seems like a little too much to increase it further

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})

Before we were only returning the `merge_commit` field which was not None when the merge was performed by turnip, and was None when source had already previously been merged into the target.

Turnip was updated to also return this `previously_merged` field, so that if source had already been previously been merged to target, we now search for the `merge_commit` to return it, but added this `previously_merged` flag to indicate whether the merge was performed by the turnip request, or it had already been merged.

So before the response would be a 200 status code {"merge_commit": None} if the request had already been merged previously, and now it's a 200 status code {"merge_commit": <merge commit>, "previously_merged": True}

For regular merges where the request actually merges the code, the response would have been {"merge_commit": <merge_commit>} and now it will be {"merge_commit": <merge commit>, "previously_merged": False}

>          )
>          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.