Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod-tests
Commits
fad9501f6d87
Commit
cb7586b6
authored
Oct 29, 2020
by
Georges Racinet on mutations.racinet.fr
Browse files
Git: testing pipeline jobs
Both SHA and repo_type had to be corrected, being still hardcoded for Mercurial.
parent
1d1a69899fba
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/test_git.py
View file @
fad9501f
...
...
@@ -132,6 +132,10 @@ def test_mergerequest_api_explicit_merge_message(git_project, tmpdir):
src_branch
=
prepare_mr_source_branch
(
repo
,
with_ci
=
True
)
mr_id
=
proj
.
api_create_merge_request
(
source
=
src_branch
,
target
=
'master'
)
jobs
=
runner
.
wait_assert_jobs
(
2
)
assert
set
(
job
[
'git_info'
][
'ref'
]
for
job
in
jobs
)
==
{
'master'
,
'antelope'
}
api_accept_merge_request
(
proj
,
mr_id
)
repo
.
git
(
'pull'
,
'--all'
)
print
(
"Graph after API merge:"
)
...
...
@@ -151,3 +155,11 @@ def test_mergerequest_api_explicit_merge_message(git_project, tmpdir):
commit_links
=
proj
.
webdriver_get_merge_request_commits
(
mr_id
)
assert
any
(
expected
in
l
.
text
for
l
in
commit_links
),
(
"Commit summaries don't contain %r"
%
expected
)
# there's a CI job for the target
job
=
runner
.
wait_assert_one_job
()
vcs_info
=
job
[
'git_info'
]
assert
vcs_info
[
'ref'
]
==
'master'
assert
vcs_info
[
'repo_type'
]
==
'git'
assert
vcs_info
[
'sha'
]
==
repo
.
sha
(
'origin/master'
)
assert
vcs_info
.
get
(
'hgsha'
)
is
None
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment