Read about our upcoming Code of Conduct on this issue

Commit 175e1b1f authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Flake8 (lines too long)

parent 793223ff8ac8
Pipeline #13269 passed with stages
in 34 minutes and 35 seconds
......@@ -172,8 +172,9 @@ def assert_merge_detected(project, mr_id,
source_branch = mr['source_branch']
if named_branch is None:
# First, let's read the source branch it from the MR, and check that it's
# still meaningful (e.g., not replaced by an empty string or such)
# First, let's read the source branch it from the MR, and check
# that it's still meaningful (e.g., not replaced by an empty string
# or such)
assert source_branch.startswith('topic/')
# now check GitLab branch for the topic has been rightfully removed
if check_source_branch_removal:
......@@ -389,9 +390,10 @@ def test_mergerequest_stacked_amend_publish_first(test_project, tmpdir):
# and merge has been detected
# in the case of native Mercurial, the topic is still visible in the
# branchmap because it has orphan descendent. We could add the same kind
# of filtering in HGitaly than multiple heads detection and py_heptapod's mirror
# perform, but that is slow for a read operation that happens all the time
# (listing branches). Better to say in the short term that we don't care.
# of filtering in HGitaly than multiple heads detection and
# py_heptapod's mirror perform, but that is slow for a read operation
# that happens all the time (listing branches). Better to say in the
# short term that we don't care.
assert_merge_detected(
test_project, mr_id,
check_source_branch_removal=not test_project.hg_native)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment