diff --git a/ogr/services/gitlab/pull_request.py b/ogr/services/gitlab/pull_request.py
index c8b791a4c..96f486a9c 100644
--- a/ogr/services/gitlab/pull_request.py
+++ b/ogr/services/gitlab/pull_request.py
@@ -25,6 +25,7 @@
from typing import Dict, List, Optional
from gitlab.v4.objects import MergeRequest as _GitlabMergeRequest
+from gitlab.exceptions import GitlabGetError
from ogr.abstract import PullRequest, PRComment, PRStatus, MergeCommitStatus
from ogr.exceptions import GitlabAPIException
@@ -123,8 +124,20 @@ def head_commit(self) -> str:
return self._raw_pr.sha
@property
- def merge_commit_sha(self) -> str:
- return self._raw_pr.merge_commit_sha
+ def merge_commit_sha(self) -> Optional[str]:
+ # when merged => return merge_commit_sha
+ # otherwise => return test merge if possible
+ if self.status == PRStatus.merged:
+ return self._raw_pr.merge_commit_sha
+
+ # works for test merge only with python-gitlab>=2.10.0
+ try:
+ response = self._raw_pr.merge_ref()
+ except GitlabGetError as ex:
+ if ex.response_code == 400:
+ return None
+ raise
+ return response.get("commit_id")
@property
def merge_commit_status(self) -> MergeCommitStatus:
diff --git a/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_merge_commit_sha.yaml b/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_merge_commit_sha.yaml
index 185ecf87c..1732edeb3 100644
--- a/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_merge_commit_sha.yaml
+++ b/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_merge_commit_sha.yaml
@@ -7,7 +7,7 @@ requests.sessions:
GET:
https://gitlab.com/api/v4/projects/14233409/merge_requests/1:
- metadata:
- latency: 0.30664944648742676
+ latency: 0.728130578994751
module_call_list:
- unittest.case
- requre.record_and_replace
@@ -16,7 +16,7 @@ requests.sessions:
- ogr.services.gitlab.pull_request
- gitlab.exceptions
- gitlab.mixins
- - gitlab
+ - gitlab.client
- requre.objects
- requre.cassette
- requests.sessions
@@ -87,7 +87,7 @@ requests.sessions:
squash: false
squash_commit_sha: null
state: merged
- subscribed: false
+ subscribed: true
target_branch: master
target_project_id: 14233409
task_completion_status:
@@ -102,422 +102,30 @@ requests.sessions:
updated_at: '2020-10-12T10:29:20.574Z'
upvotes: 0
user:
- can_merge: false
+ can_merge: true
user_notes_count: 3
web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/1
work_in_progress: false
_next: null
- elapsed: 0.306201
- encoding: null
+ elapsed: 0.727067
+ encoding: utf-8
headers:
CF-Cache-Status: DYNAMIC
- CF-RAY: 66460703585905da-IAD
+ CF-RAY: 679f4ebcca15dfd3-FRA
Cache-Control: max-age=0, private, must-revalidate
Connection: keep-alive
Content-Encoding: gzip
Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:55 GMT
- Etag: W/"ed497aba09a68017b0186e3bc4a2ed49"
+ Date: Thu, 05 Aug 2021 10:23:01 GMT
+ Etag: W/"5f04be4f8e336b779c80ef3fbeca1d56"
Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-03-lb-gprd
- GitLab-SV: localhost
- RateLimit-Limit: '2000'
- RateLimit-Observed: '18'
- RateLimit-Remaining: '1982'
- RateLimit-Reset: '1624538515'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:55 GMT
- Referrer-Policy: strict-origin-when-cross-origin
- Server: cloudflare
- Strict-Transport-Security: max-age=31536000
- Transfer-Encoding: chunked
- Vary: Origin
- X-Content-Type-Options: nosniff
- X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K7KMY00HA1YXRP67X89K
- X-Runtime: '0.170230'
- cf-request-id: 0adfa2b61d000005da15af2000000001
- raw: !!binary ""
- reason: OK
- status_code: 200
- https://gitlab.com/api/v4/projects/14233409/merge_requests/12:
- - metadata:
- latency: 0.1910078525543213
- module_call_list:
- - unittest.case
- - requre.record_and_replace
- - tests.integration.gitlab.test_pull_requests
- - ogr.utils
- - ogr.services.gitlab.pull_request
- - gitlab.exceptions
- - gitlab.mixins
- - gitlab
- - requre.objects
- - requre.cassette
- - requests.sessions
- - send
- output:
- __store_indicator: 2
- _content:
- approvals_before_merge: 0
- assignee: null
- assignees: []
- author:
- avatar_url: https://secure.gravatar.com/avatar/e1ae3427f994784121371108f12eceb5?s=80&d=identicon
- id: 4626962
- name: jscotka
- state: active
- username: jscotka
- web_url: https://gitlab.com/jscotka
- blocking_discussions_resolved: true
- changes_count: '1'
- closed_at: null
- closed_by: null
- created_at: '2019-09-26T14:08:08.843Z'
- description: ''
- diff_refs:
- base_sha: ff3df8288306e95ad76f803d6b9e398efe0b754d
- head_sha: 2543f1728c7e1c2b8772d0dc11dc8b1870f4db60
- start_sha: ff3df8288306e95ad76f803d6b9e398efe0b754d
- discussion_locked: null
- downvotes: 0
- draft: false
- first_contribution: false
- first_deployed_to_production_at: null
- force_remove_source_branch: false
- has_conflicts: false
- head_pipeline: null
- id: 38258502
- iid: 12
- labels: []
- latest_build_finished_at: null
- latest_build_started_at: null
- merge_commit_sha: f6de56d97ec3ec74cd5194e79175162d9f969195
- merge_error: null
- merge_status: can_be_merged
- merge_when_pipeline_succeeds: false
- merged_at: '2019-09-26T14:20:35.371Z'
- merged_by:
- avatar_url: https://secure.gravatar.com/avatar/e1ae3427f994784121371108f12eceb5?s=80&d=identicon
- id: 4626962
- name: jscotka
- state: active
- username: jscotka
- web_url: https://gitlab.com/jscotka
- milestone: null
- pipeline: null
- project_id: 14233409
- reference: '!12'
- references:
- full: packit-service/ogr-tests!12
- relative: '!12'
- short: '!12'
- reviewers: []
- sha: 2543f1728c7e1c2b8772d0dc11dc8b1870f4db60
- should_remove_source_branch: null
- source_branch: pr-test2
- source_project_id: 14233409
- squash: false
- squash_commit_sha: null
- state: merged
- subscribed: false
- target_branch: master
- target_project_id: 14233409
- task_completion_status:
- completed_count: 0
- count: 0
- time_stats:
- human_time_estimate: null
- human_total_time_spent: null
- time_estimate: 0
- total_time_spent: 0
- title: Update README.md
- updated_at: '2019-09-26T14:20:35.342Z'
- upvotes: 0
- user:
- can_merge: false
- user_notes_count: 0
- web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/12
- work_in_progress: false
- _next: null
- elapsed: 0.190612
- encoding: null
- headers:
- CF-Cache-Status: DYNAMIC
- CF-RAY: 664607055b7305da-IAD
- Cache-Control: max-age=0, private, must-revalidate
- Connection: keep-alive
- Content-Encoding: gzip
- Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:56 GMT
- Etag: W/"ad5d040bc99471264612002ba5f6470e"
- Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-11-lb-gprd
- GitLab-SV: localhost
- RateLimit-Limit: '2000'
- RateLimit-Observed: '19'
- RateLimit-Remaining: '1981'
- RateLimit-Reset: '1624538516'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:56 GMT
- Referrer-Policy: strict-origin-when-cross-origin
- Server: cloudflare
- Strict-Transport-Security: max-age=31536000
- Transfer-Encoding: chunked
- Vary: Origin
- X-Content-Type-Options: nosniff
- X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K7W56HSKBRQCTQDYJ42V
- X-Runtime: '0.099084'
- cf-request-id: 0adfa2b755000005da1c1fb000000001
- raw: !!binary ""
- reason: OK
- status_code: 200
- https://gitlab.com/api/v4/projects/14233409/merge_requests/19:
- - metadata:
- latency: 0.24100089073181152
- module_call_list:
- - unittest.case
- - requre.record_and_replace
- - tests.integration.gitlab.test_pull_requests
- - ogr.utils
- - ogr.services.gitlab.pull_request
- - gitlab.exceptions
- - gitlab.mixins
- - gitlab
- - requre.objects
- - requre.cassette
- - requests.sessions
- - send
- output:
- __store_indicator: 2
- _content:
- approvals_before_merge: 0
- assignee: null
- assignees: []
- author:
- avatar_url: https://assets.gitlab-static.net/uploads/-/system/user/avatar/375555/avatar.png
- id: 375555
- name: Matej Focko
- state: active
- username: mfocko
- web_url: https://gitlab.com/mfocko
- blocking_discussions_resolved: true
- changes_count: '1'
- closed_at: null
- closed_by: null
- created_at: '2019-11-26T19:39:01.381Z'
- description: test2
- diff_refs:
- base_sha: 3d278426b64647aa92fb63c8d7ccdb4d8c4919ff
- head_sha: 59b1a9bab5b5198c619270646410867788685c16
- start_sha: 3d278426b64647aa92fb63c8d7ccdb4d8c4919ff
- discussion_locked: null
- downvotes: 0
- draft: false
- first_contribution: false
- first_deployed_to_production_at: null
- force_remove_source_branch: false
- has_conflicts: false
- head_pipeline: null
- id: 43305101
- iid: 19
- labels: []
- latest_build_finished_at: null
- latest_build_started_at: null
- merge_commit_sha: b8e18207cfdad954f1b3a96db34d0706b272e6cf
- merge_error: null
- merge_status: can_be_merged
- merge_when_pipeline_succeeds: false
- merged_at: '2019-11-26T19:40:49.350Z'
- merged_by:
- avatar_url: https://assets.gitlab-static.net/uploads/-/system/user/avatar/375555/avatar.png
- id: 375555
- name: Matej Focko
- state: active
- username: mfocko
- web_url: https://gitlab.com/mfocko
- milestone: null
- pipeline: null
- project_id: 14233409
- reference: '!19'
- references:
- full: packit-service/ogr-tests!19
- relative: '!19'
- short: '!19'
- reviewers: []
- sha: 59b1a9bab5b5198c619270646410867788685c16
- should_remove_source_branch: null
- source_branch: test_branch
- source_project_id: 14233409
- squash: false
- squash_commit_sha: null
- state: merged
- subscribed: false
- target_branch: master
- target_project_id: 14233409
- task_completion_status:
- completed_count: 0
- count: 0
- time_stats:
- human_time_estimate: null
- human_total_time_spent: null
- time_estimate: 0
- total_time_spent: 0
- title: Got to merge something
- updated_at: '2020-10-12T10:28:51.845Z'
- upvotes: 0
- user:
- can_merge: false
- user_notes_count: 2
- web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/19
- work_in_progress: false
- _next: null
- elapsed: 0.2406
- encoding: null
- headers:
- CF-Cache-Status: DYNAMIC
- CF-RAY: 664607068d3605da-IAD
- Cache-Control: max-age=0, private, must-revalidate
- Connection: keep-alive
- Content-Encoding: gzip
- Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:56 GMT
- Etag: W/"cc755b7283fdec804dc04aa8a9f9cb5b"
- Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-07-lb-gprd
- GitLab-SV: localhost
- RateLimit-Limit: '2000'
- RateLimit-Observed: '20'
- RateLimit-Remaining: '1980'
- RateLimit-Reset: '1624538516'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:56 GMT
- Referrer-Policy: strict-origin-when-cross-origin
- Server: cloudflare
- Strict-Transport-Security: max-age=31536000
- Transfer-Encoding: chunked
- Vary: Origin
- X-Content-Type-Options: nosniff
- X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K824K3Z2PD2686EB0V7Q
- X-Runtime: '0.137274'
- cf-request-id: 0adfa2b81a000005da4a923000000001
- raw: !!binary ""
- reason: OK
- status_code: 200
- https://gitlab.com/api/v4/projects/14233409/merge_requests/79:
- - metadata:
- latency: 0.20970726013183594
- module_call_list:
- - unittest.case
- - requre.record_and_replace
- - tests.integration.gitlab.test_pull_requests
- - ogr.utils
- - ogr.services.gitlab.pull_request
- - gitlab.exceptions
- - gitlab.mixins
- - gitlab
- - requre.objects
- - requre.cassette
- - requests.sessions
- - send
- output:
- __store_indicator: 2
- _content:
- allow_collaboration: true
- allow_maintainer_to_push: true
- approvals_before_merge: null
- assignee: null
- assignees: []
- author:
- avatar_url: https://secure.gravatar.com/avatar/eff1ae69a40d35559a382d36b53b72d2?s=80&d=identicon
- id: 2952463
- name: Jiri Popelka
- state: active
- username: jpopelka
- web_url: https://gitlab.com/jpopelka
- blocking_discussions_resolved: true
- changes_count: '1'
- closed_at: null
- closed_by: null
- created_at: '2021-06-24T12:21:59.290Z'
- description: please ignore, I'm trying to create a MR with a conflict
- diff_refs:
- base_sha: b8e18207cfdad954f1b3a96db34d0706b272e6cf
- head_sha: 45e3737aea87a9fd14adcf6a42070cb4f8665ada
- start_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
- discussion_locked: null
- downvotes: 0
- draft: false
- first_contribution: false
- first_deployed_to_production_at: null
- force_remove_source_branch: true
- has_conflicts: true
- head_pipeline: null
- id: 105673770
- iid: 79
- labels: []
- latest_build_finished_at: null
- latest_build_started_at: null
- merge_commit_sha: null
- merge_error: null
- merge_status: cannot_be_merged
- merge_when_pipeline_succeeds: false
- merged_at: null
- merged_by: null
- milestone: null
- pipeline: null
- project_id: 14233409
- reference: '!79'
- references:
- full: packit-service/ogr-tests!79
- relative: '!79'
- short: '!79'
- reviewers: []
- sha: 45e3737aea87a9fd14adcf6a42070cb4f8665ada
- should_remove_source_branch: null
- source_branch: create-conflict
- source_project_id: 27674837
- squash: false
- squash_commit_sha: null
- state: opened
- subscribed: false
- target_branch: master
- target_project_id: 14233409
- task_completion_status:
- completed_count: 0
- count: 0
- time_stats:
- human_time_estimate: null
- human_total_time_spent: null
- time_estimate: 0
- total_time_spent: 0
- title: testing conflict
- updated_at: '2021-06-24T12:21:59.290Z'
- upvotes: 0
- user:
- can_merge: false
- user_notes_count: 0
- web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/79
- work_in_progress: false
- _next: null
- elapsed: 0.209292
- encoding: null
- headers:
- CF-Cache-Status: DYNAMIC
- CF-RAY: 66460708182705da-IAD
- Cache-Control: max-age=0, private, must-revalidate
- Connection: keep-alive
- Content-Encoding: gzip
- Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:56 GMT
- Etag: W/"cafe15a5a4b9a12e2b1be49e26b13157"
- Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-04-lb-gprd
+ GitLab-LB: fe-05-lb-gprd
GitLab-SV: localhost
RateLimit-Limit: '2000'
- RateLimit-Observed: '21'
- RateLimit-Remaining: '1979'
- RateLimit-Reset: '1624538516'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:56 GMT
+ RateLimit-Observed: '8'
+ RateLimit-Remaining: '1992'
+ RateLimit-Reset: '1628159040'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:24:00 GMT
Referrer-Policy: strict-origin-when-cross-origin
Server: cloudflare
Strict-Transport-Security: max-age=31536000
@@ -525,15 +133,14 @@ requests.sessions:
Vary: Origin
X-Content-Type-Options: nosniff
X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K8A1QXB004AYVK1ARM1S
- X-Runtime: '0.119820'
- cf-request-id: 0adfa2b913000005da12968000000001
+ X-Request-Id: 01FCAXCWJR4RPX6AF1A5ZX914K
+ X-Runtime: '0.153004'
raw: !!binary ""
reason: OK
status_code: 200
https://gitlab.com/api/v4/projects/packit-service%2Fogr-tests:
- metadata:
- latency: 0.21320104598999023
+ latency: 0.6322100162506104
module_call_list:
- unittest.case
- requre.record_and_replace
@@ -541,9 +148,10 @@ requests.sessions:
- ogr.utils
- ogr.services.gitlab.pull_request
- ogr.services.gitlab.project
+ - gitlab.v4.objects.projects
- gitlab.exceptions
- gitlab.mixins
- - gitlab
+ - gitlab.client
- requre.objects
- requre.cassette
- requests.sessions
@@ -569,6 +177,7 @@ requests.sessions:
autoclose_referenced_issues: true
avatar_url: null
build_coverage_regex: null
+ build_git_strategy: fetch
build_timeout: 3600
builds_access_level: enabled
can_create_merge_request_in: true
@@ -577,6 +186,7 @@ requests.sessions:
ci_forward_deployment_enabled: null
ci_job_token_scope_enabled: false
compliance_frameworks: []
+ container_registry_access_level: enabled
container_registry_enabled: true
container_registry_image_prefix: registry.gitlab.com/packit-service/ogr-tests
created_at: '2019-09-10T10:28:09.946Z'
@@ -587,23 +197,26 @@ requests.sessions:
empty_repo: false
external_authorization_classification_label: ''
forking_access_level: enabled
- forks_count: 8
+ forks_count: 7
http_url_to_repo: https://gitlab.com/packit-service/ogr-tests.git
id: 14233409
+ import_error: null
import_status: none
issues_access_level: enabled
issues_enabled: true
issues_template: null
jobs_enabled: true
keep_latest_artifact: true
- last_activity_at: '2021-06-24T12:22:00.095Z'
+ last_activity_at: '2021-08-05T09:29:28.037Z'
lfs_enabled: true
marked_for_deletion_at: null
marked_for_deletion_on: null
merge_method: merge
+ merge_pipelines_enabled: false
merge_requests_access_level: enabled
merge_requests_enabled: true
merge_requests_template: null
+ merge_trains_enabled: false
mirror: false
name: ogr-tests
name_with_namespace: packit-service / ogr-tests
@@ -625,7 +238,9 @@ requests.sessions:
path: ogr-tests
path_with_namespace: packit-service/ogr-tests
permissions:
- group_access: null
+ group_access:
+ access_level: 50
+ notification_level: 3
project_access: null
printing_merge_request_link_enabled: true
public_jobs: true
@@ -636,7 +251,8 @@ requests.sessions:
requirements_enabled: true
resolve_outdated_diff_discussions: false
restrict_user_defined_variables: false
- security_and_compliance_enabled: false
+ runners_token: VjGdzzwZbsTY37sxUeWL
+ security_and_compliance_enabled: true
service_desk_address: incoming+packit-service-ogr-tests-14233409-issue-@incoming.gitlab.com
service_desk_enabled: true
shared_runners_enabled: true
@@ -654,25 +270,25 @@ requests.sessions:
wiki_access_level: enabled
wiki_enabled: true
_next: null
- elapsed: 0.212788
- encoding: null
+ elapsed: 0.630241
+ encoding: utf-8
headers:
CF-Cache-Status: DYNAMIC
- CF-RAY: 66460701fdf205da-IAD
+ CF-RAY: 679f4ea1fbe5dfd3-FRA
Cache-Control: max-age=0, private, must-revalidate
Connection: keep-alive
Content-Encoding: gzip
Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:55 GMT
- Etag: W/"30a6ab3924cc4757674331997805169d"
+ Date: Thu, 05 Aug 2021 10:22:56 GMT
+ Etag: W/"694a7061c85cdc1d59b68d9195108fa4"
Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-05-lb-gprd
+ GitLab-LB: fe-13-lb-gprd
GitLab-SV: localhost
RateLimit-Limit: '2000'
- RateLimit-Observed: '19'
- RateLimit-Remaining: '1981'
- RateLimit-Reset: '1624538515'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:55 GMT
+ RateLimit-Observed: '1'
+ RateLimit-Remaining: '1999'
+ RateLimit-Reset: '1628159036'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:56 GMT
Referrer-Policy: strict-origin-when-cross-origin
Server: cloudflare
Strict-Transport-Security: max-age=31536000
@@ -680,15 +296,14 @@ requests.sessions:
Vary: Origin
X-Content-Type-Options: nosniff
X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K7BGEVVFRE39RK5Z2AJZ
- X-Runtime: '0.118069'
- cf-request-id: 0adfa2b53d000005da3a029000000001
+ X-Request-Id: 01FCAXCRJ2MKWS67P696WDV646
+ X-Runtime: '0.117619'
raw: !!binary ""
reason: OK
status_code: 200
https://gitlab.com/api/v4/user:
- metadata:
- latency: 0.39325928688049316
+ latency: 0.3001220226287842
module_call_list:
- unittest.case
- requre.record_and_replace
@@ -697,10 +312,10 @@ requests.sessions:
- ogr.services.gitlab.pull_request
- ogr.services.gitlab.project
- ogr.services.gitlab.service
- - gitlab
+ - gitlab.client
- gitlab.exceptions
- gitlab.mixins
- - gitlab
+ - gitlab.client
- requre.objects
- requre.cassette
- requests.sessions
@@ -708,68 +323,80 @@ requests.sessions:
output:
__store_indicator: 2
_content:
- avatar_url: https://secure.gravatar.com/avatar/c7fe77b328a6631baf8705597be56406?s=80&d=identicon
- bio: ''
- bio_html: ''
+ avatar_url: https://gitlab.com/uploads/-/system/user/avatar/375555/avatar.png
+ bio: CS student @ FI MUNI (also tutoring), working in Red Hat. Fan of
+ open-source, Haskell, functional programming, containers and Linux.
+ bio_html: CS student @ FI MUNI
+ (also tutoring), working in Red Hat. Fan of open-source, Haskell, functional
+ programming, containers and Linux.
bot: false
can_create_group: true
can_create_project: true
- color_scheme_id: 1
- commit_email: bcrocker@redhat.com
- confirmed_at: '2020-07-22T18:20:14.744Z'
- created_at: '2020-07-22T18:09:47.704Z'
- current_sign_in_at: '2021-06-23T12:22:43.587Z'
- email: bcrocker@redhat.com
+ color_scheme_id: 2
+ commit_email: matej.focko@outlook.com
+ confirmed_at: '2020-07-24T20:00:33.764Z'
+ created_at: '2016-01-15T21:12:31.705Z'
+ current_sign_in_at: '2021-08-02T15:58:36.283Z'
+ email: matej.focko@outlook.com
external: false
extra_shared_runners_minutes_limit: null
followers: 0
following: 0
- id: 6466632
+ id: 375555
identities:
- - extern_uid: c7a504c0-7e21-11e6-807a-001a4a0a0045
+ - extern_uid: 46bd3cb0-73a0-11ea-8e0e-0a58ac142609
provider: group_saml
saml_provider_id: 1769
+ - extern_uid: '8149784'
+ provider: github
+ saml_provider_id: null
+ - extern_uid: '90177795'
+ provider: twitter
+ saml_provider_id: null
+ - extern_uid: '104088596414930556092'
+ provider: google_oauth2
+ saml_provider_id: null
job_title: ''
- last_activity_on: '2021-06-24'
- last_sign_in_at: '2021-06-22T17:26:14.699Z'
- linkedin: ''
- location: null
- name: Ben Crocker
- organization: null
+ last_activity_on: '2021-08-05'
+ last_sign_in_at: '2021-07-19T09:54:27.845Z'
+ linkedin: mfocko
+ location: Brno, Czechia
+ name: Matej Focko
+ organization: Red Hat
private_profile: false
projects_limit: 100000
- pronouns: null
+ pronouns: ''
public_email: ''
- shared_runners_minutes_limit: null
+ shared_runners_minutes_limit: 2000
skype: ''
state: active
- theme_id: 1
- twitter: ''
- two_factor_enabled: false
- username: bcrocker
- web_url: https://gitlab.com/bcrocker
- website_url: ''
- work_information: null
+ theme_id: 11
+ twitter: MatejFocko
+ two_factor_enabled: true
+ username: mfocko
+ web_url: https://gitlab.com/mfocko
+ website_url: https://me.mfocko.xyz
+ work_information: Red Hat
_next: null
- elapsed: 0.392854
- encoding: null
+ elapsed: 0.299018
+ encoding: utf-8
headers:
CF-Cache-Status: DYNAMIC
- CF-RAY: 664606ffeac705da-IAD
+ CF-RAY: 679f4e9f6fa1dfd3-FRA
Cache-Control: max-age=0, private, must-revalidate
Connection: keep-alive
Content-Encoding: gzip
Content-Type: application/json
- Date: Thu, 24 Jun 2021 12:40:55 GMT
- Etag: W/"495e10b7ac8e33cdfafdc8d7dede21b4"
+ Date: Thu, 05 Aug 2021 10:22:56 GMT
+ Etag: W/"7917511161186a6ba204a97ce3181d02"
Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
- GitLab-LB: fe-05-lb-gprd
+ GitLab-LB: fe-02-lb-gprd
GitLab-SV: localhost
RateLimit-Limit: '2000'
- RateLimit-Observed: '18'
- RateLimit-Remaining: '1982'
- RateLimit-Reset: '1624538515'
- RateLimit-ResetTime: Thu, 24 Jun 2021 12:41:55 GMT
+ RateLimit-Observed: '1'
+ RateLimit-Remaining: '1999'
+ RateLimit-Reset: '1628159036'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:56 GMT
Referrer-Policy: strict-origin-when-cross-origin
Server: cloudflare
Strict-Transport-Security: max-age=31536000
@@ -777,9 +404,8 @@ requests.sessions:
Vary: Origin
X-Content-Type-Options: nosniff
X-Frame-Options: SAMEORIGIN
- X-Request-Id: 01F8Z0K71C38MNJP9CSTC84BRV
- X-Runtime: '0.114576'
- cf-request-id: 0adfa2b3f6000005dadd098000000001
+ X-Request-Id: 01FCAXCR05TKVPQTQZKQ9P0F3D
+ X-Runtime: '0.035951'
raw: !!binary ""
reason: OK
status_code: 200
diff --git a/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_test_merge_commit_sha.yaml b/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_test_merge_commit_sha.yaml
new file mode 100644
index 000000000..ff35965cb
--- /dev/null
+++ b/tests/integration/gitlab/test_data/test_pull_requests/PullRequests.test_test_merge_commit_sha.yaml
@@ -0,0 +1,1177 @@
+_requre:
+ DataTypes: 1
+ key_strategy: StorageKeysInspectSimple
+ version_storage_file: 3
+requests.sessions:
+ send:
+ GET:
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/1:
+ - metadata:
+ latency: 0.728130578994751
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ approvals_before_merge: 0
+ assignee: null
+ assignees: []
+ author:
+ avatar_url: https://secure.gravatar.com/avatar/9c8d9a288151a8e563547e082c591f2a?s=80&d=identicon
+ id: 4594931
+ name: "Laura Barcziov\xE1"
+ state: active
+ username: lbarcziova
+ web_url: https://gitlab.com/lbarcziova
+ blocking_discussions_resolved: true
+ changes_count: '1'
+ closed_at: null
+ closed_by: null
+ created_at: '2019-09-10T14:03:24.365Z'
+ description: description of mergerequest
+ diff_refs:
+ base_sha: 24c86d0704694f686329b2ea636c5b7522cfdc40
+ head_sha: d490ec67dd98f69dfdc1732b98bb3189f0e0aace
+ start_sha: 24c86d0704694f686329b2ea636c5b7522cfdc40
+ discussion_locked: null
+ downvotes: 0
+ draft: false
+ first_contribution: false
+ first_deployed_to_production_at: null
+ force_remove_source_branch: false
+ has_conflicts: false
+ head_pipeline: null
+ id: 36948617
+ iid: 1
+ labels:
+ - test_lb1
+ - test_lb2
+ latest_build_finished_at: null
+ latest_build_started_at: null
+ merge_commit_sha: 101a42bbbe174d04b465d49caf274dc3b4defeca
+ merge_error: null
+ merge_status: can_be_merged
+ merge_when_pipeline_succeeds: false
+ merged_at: '2019-09-11T08:55:32.822Z'
+ merged_by:
+ avatar_url: https://secure.gravatar.com/avatar/9c8d9a288151a8e563547e082c591f2a?s=80&d=identicon
+ id: 4594931
+ name: "Laura Barcziov\xE1"
+ state: active
+ username: lbarcziova
+ web_url: https://gitlab.com/lbarcziova
+ milestone: null
+ pipeline: null
+ project_id: 14233409
+ reference: '!1'
+ references:
+ full: packit-service/ogr-tests!1
+ relative: '!1'
+ short: '!1'
+ reviewers: []
+ sha: d490ec67dd98f69dfdc1732b98bb3189f0e0aace
+ should_remove_source_branch: null
+ source_branch: change
+ source_project_id: 14233409
+ squash: false
+ squash_commit_sha: null
+ state: merged
+ subscribed: true
+ target_branch: master
+ target_project_id: 14233409
+ task_completion_status:
+ completed_count: 0
+ count: 0
+ time_stats:
+ human_time_estimate: null
+ human_total_time_spent: null
+ time_estimate: 0
+ total_time_spent: 0
+ title: change
+ updated_at: '2020-10-12T10:29:20.574Z'
+ upvotes: 0
+ user:
+ can_merge: true
+ user_notes_count: 3
+ web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/1
+ work_in_progress: false
+ _next: null
+ elapsed: 0.727067
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ebcca15dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:23:01 GMT
+ Etag: W/"5f04be4f8e336b779c80ef3fbeca1d56"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-05-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '8'
+ RateLimit-Remaining: '1992'
+ RateLimit-Reset: '1628159040'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:24:00 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCWJR4RPX6AF1A5ZX914K
+ X-Runtime: '0.153004'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/25:
+ - metadata:
+ latency: 0.5438625812530518
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ allow_collaboration: false
+ allow_maintainer_to_push: false
+ approvals_before_merge: null
+ assignee: null
+ assignees: []
+ author:
+ avatar_url: https://secure.gravatar.com/avatar/5a2e7f6710bff47b94d24b44b55fd7f7?s=80&d=identicon
+ id: 433670
+ name: "Franti\u0161ek Lachman"
+ state: active
+ username: lachmanfrantisek
+ web_url: https://gitlab.com/lachmanfrantisek
+ blocking_discussions_resolved: true
+ changes_count: '1'
+ closed_at: null
+ closed_by: null
+ created_at: '2020-05-15T11:03:08.893Z'
+ description: ''
+ diff_refs:
+ base_sha: 1050fc5e57a5d145ebaadb0e1748fbc1d94e7b4c
+ head_sha: 9ea58e21114d8ea9fdd4bdb733d3a6db1d9d244a
+ start_sha: b8e18207cfdad954f1b3a96db34d0706b272e6cf
+ discussion_locked: null
+ downvotes: 0
+ draft: false
+ first_contribution: false
+ first_deployed_to_production_at: null
+ force_remove_source_branch: false
+ has_conflicts: true
+ head_pipeline:
+ before_sha: '0000000000000000000000000000000000000000'
+ committed_at: null
+ coverage: null
+ created_at: '2020-05-15T11:03:34.706Z'
+ detailed_status:
+ details_path: /lachmanfrantisek/ogr-tests/-/pipelines/146373711
+ favicon: /assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png
+ group: success
+ has_details: true
+ icon: status_success
+ illustration: null
+ label: passed
+ text: passed
+ tooltip: passed
+ duration: null
+ finished_at: '2020-05-15T11:03:34.958Z'
+ id: 146373711
+ project_id: 14255608
+ queued_duration: null
+ ref: lachmanfrantisek-master-patch-55321
+ sha: 9ea58e21114d8ea9fdd4bdb733d3a6db1d9d244a
+ started_at: null
+ status: success
+ tag: false
+ updated_at: '2020-05-15T11:03:34.959Z'
+ user:
+ avatar_url: https://secure.gravatar.com/avatar/5a2e7f6710bff47b94d24b44b55fd7f7?s=80&d=identicon
+ id: 433670
+ name: "Franti\u0161ek Lachman"
+ state: active
+ username: lachmanfrantisek
+ web_url: https://gitlab.com/lachmanfrantisek
+ web_url: https://gitlab.com/lachmanfrantisek/ogr-tests/-/pipelines/146373711
+ yaml_errors: null
+ id: 58760686
+ iid: 25
+ labels: []
+ latest_build_finished_at: '2020-05-15T11:03:34.958Z'
+ latest_build_started_at: null
+ merge_commit_sha: null
+ merge_error: null
+ merge_status: cannot_be_merged
+ merge_when_pipeline_succeeds: false
+ merged_at: null
+ merged_by: null
+ milestone: null
+ pipeline:
+ created_at: '2020-05-15T11:03:34.706Z'
+ id: 146373711
+ project_id: 14255608
+ ref: lachmanfrantisek-master-patch-55321
+ sha: 9ea58e21114d8ea9fdd4bdb733d3a6db1d9d244a
+ status: success
+ updated_at: '2020-05-15T11:03:34.959Z'
+ web_url: https://gitlab.com/lachmanfrantisek/ogr-tests/-/pipelines/146373711
+ project_id: 14233409
+ reference: '!25'
+ references:
+ full: packit-service/ogr-tests!25
+ relative: '!25'
+ short: '!25'
+ reviewers: []
+ sha: 9ea58e21114d8ea9fdd4bdb733d3a6db1d9d244a
+ should_remove_source_branch: null
+ source_branch: lachmanfrantisek-master-patch-55321
+ source_project_id: 14255608
+ squash: false
+ squash_commit_sha: null
+ state: opened
+ subscribed: false
+ target_branch: master
+ target_project_id: 14233409
+ task_completion_status:
+ completed_count: 0
+ count: 0
+ time_stats:
+ human_time_estimate: null
+ human_total_time_spent: null
+ time_estimate: 0
+ total_time_spent: 0
+ title: Check commit status.
+ updated_at: '2020-05-15T11:03:08.893Z'
+ upvotes: 0
+ user:
+ can_merge: true
+ user_notes_count: 0
+ web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/25
+ work_in_progress: false
+ _next: null
+ elapsed: 0.541245
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4eae286edfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:58 GMT
+ Etag: W/"c68baebc344b8da473a53767080d3ff1"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-08-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '4'
+ RateLimit-Remaining: '1996'
+ RateLimit-Reset: '1628159038'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:58 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCT9T7DPN3TN4G0B2Z4EC
+ X-Runtime: '0.133492'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/25/merge_ref:
+ - metadata:
+ latency: 0.5669512748718262
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.services.gitlab.pull_request
+ - gitlab.cli
+ - gitlab.exceptions
+ - gitlab.v4.objects.merge_requests
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ message: Merge request is not mergeable
+ _next: null
+ elapsed: 0.564627
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4eb0ed2edfd3-FRA
+ Cache-Control: no-cache
+ Connection: keep-alive
+ Content-Length: '44'
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:59 GMT
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-12-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '5'
+ RateLimit-Remaining: '1995'
+ RateLimit-Reset: '1628159039'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:59 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCTQH9XCVJ1E7ND2VW0Q3
+ X-Runtime: '0.273944'
+ raw: !!binary ""
+ reason: Bad Request
+ status_code: 400
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/77:
+ - metadata:
+ latency: 0.634528398513794
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ allow_collaboration: true
+ allow_maintainer_to_push: true
+ approvals_before_merge: null
+ assignee: null
+ assignees: []
+ author:
+ avatar_url: https://secure.gravatar.com/avatar/c7fe77b328a6631baf8705597be56406?s=80&d=identicon
+ id: 6466632
+ name: Ben Crocker
+ state: active
+ username: bcrocker
+ web_url: https://gitlab.com/bcrocker
+ blocking_discussions_resolved: true
+ changes_count: '1'
+ closed_at: null
+ closed_by: null
+ created_at: '2021-06-23T17:49:13.269Z'
+ description: 'Signed-off-by: Ben Crocker '
+ diff_refs:
+ base_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
+ head_sha: 6592475b6f0cd952a4626247a8acb9e250810d29
+ start_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
+ discussion_locked: null
+ downvotes: 0
+ draft: false
+ first_contribution: true
+ first_deployed_to_production_at: null
+ force_remove_source_branch: true
+ has_conflicts: false
+ head_pipeline: null
+ id: 105564125
+ iid: 77
+ labels: []
+ latest_build_finished_at: null
+ latest_build_started_at: null
+ merge_commit_sha: null
+ merge_error: null
+ merge_status: can_be_merged
+ merge_when_pipeline_succeeds: false
+ merged_at: null
+ merged_by: null
+ milestone: null
+ pipeline: null
+ project_id: 14233409
+ reference: '!77'
+ references:
+ full: packit-service/ogr-tests!77
+ relative: '!77'
+ short: '!77'
+ reviewers: []
+ sha: 6592475b6f0cd952a4626247a8acb9e250810d29
+ should_remove_source_branch: null
+ source_branch: 1-bac-test
+ source_project_id: 25840586
+ squash: false
+ squash_commit_sha: null
+ state: opened
+ subscribed: false
+ target_branch: master
+ target_project_id: 14233409
+ task_completion_status:
+ completed_count: 0
+ count: 0
+ time_stats:
+ human_time_estimate: null
+ human_total_time_spent: null
+ time_estimate: 0
+ total_time_spent: 0
+ title: bac.txt initial 2-liner
+ updated_at: '2021-06-23T21:35:05.438Z'
+ upvotes: 0
+ user:
+ can_merge: true
+ user_notes_count: 0
+ web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/77
+ work_in_progress: false
+ _next: null
+ elapsed: 0.631782
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ea4f8d1dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:57 GMT
+ Etag: W/"8fc9530e88c9c64b69c913a3fbdf4253"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-09-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '2'
+ RateLimit-Remaining: '1998'
+ RateLimit-Reset: '1628159037'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:57 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCRVNEAWPGPW4KEGXS8JJ
+ X-Runtime: '0.403746'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/77/merge_ref:
+ - metadata:
+ latency: 0.6025247573852539
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.services.gitlab.pull_request
+ - gitlab.cli
+ - gitlab.exceptions
+ - gitlab.v4.objects.merge_requests
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ commit_id: ac1f510acf65ce1e38bc61d9dd5c2d146f317e31
+ _next: null
+ elapsed: 0.601354
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ea9d920dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:57 GMT
+ Etag: W/"1a3ef4f810dfe5796e4a5732746d1b2c"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-05-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '3'
+ RateLimit-Remaining: '1997'
+ RateLimit-Reset: '1628159037'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:57 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCSSM6B4AZF64F2RFN0G0
+ X-Runtime: '0.100050'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/78:
+ - metadata:
+ latency: 0.8037259578704834
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ allow_collaboration: true
+ allow_maintainer_to_push: true
+ approvals_before_merge: null
+ assignee: null
+ assignees: []
+ author:
+ avatar_url: https://secure.gravatar.com/avatar/c7fe77b328a6631baf8705597be56406?s=80&d=identicon
+ id: 6466632
+ name: Ben Crocker
+ state: active
+ username: bcrocker
+ web_url: https://gitlab.com/bcrocker
+ blocking_discussions_resolved: true
+ changes_count: '1'
+ closed_at: '2021-08-05T09:29:28.037Z'
+ closed_by:
+ avatar_url: https://gitlab.com/uploads/-/system/user/avatar/375555/avatar.png
+ id: 375555
+ name: Matej Focko
+ state: active
+ username: mfocko
+ web_url: https://gitlab.com/mfocko
+ created_at: '2021-06-23T21:58:14.249Z'
+ description: 'Signed-off-by: Ben Crocker '
+ diff_refs:
+ base_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
+ head_sha: 019a5f5e80fcc9ded82ca6ee013552c1c776f9b2
+ start_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
+ discussion_locked: null
+ downvotes: 0
+ draft: false
+ first_contribution: true
+ first_deployed_to_production_at: null
+ force_remove_source_branch: true
+ has_conflicts: false
+ head_pipeline: null
+ id: 105586464
+ iid: 78
+ labels: []
+ latest_build_finished_at: null
+ latest_build_started_at: null
+ merge_commit_sha: null
+ merge_error: null
+ merge_status: can_be_merged
+ merge_when_pipeline_succeeds: false
+ merged_at: null
+ merged_by: null
+ milestone: null
+ pipeline: null
+ project_id: 14233409
+ reference: '!78'
+ references:
+ full: packit-service/ogr-tests!78
+ relative: '!78'
+ short: '!78'
+ reviewers: []
+ sha: 019a5f5e80fcc9ded82ca6ee013552c1c776f9b2
+ should_remove_source_branch: null
+ source_branch: 2-bac-conflict
+ source_project_id: 25840586
+ squash: false
+ squash_commit_sha: null
+ state: closed
+ subscribed: false
+ target_branch: master
+ target_project_id: 14233409
+ task_completion_status:
+ completed_count: 0
+ count: 0
+ time_stats:
+ human_time_estimate: null
+ human_total_time_spent: null
+ time_estimate: 0
+ total_time_spent: 0
+ title: Changes based on initial commit of README.md
+ updated_at: '2021-08-05T09:29:28.003Z'
+ upvotes: 0
+ user:
+ can_merge: true
+ user_notes_count: 0
+ web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/78
+ work_in_progress: false
+ _next: null
+ elapsed: 0.801176
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4eb64f10dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:59 GMT
+ Etag: W/"63c147b51ab71f098aa15192a33a5f14"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-13-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '6'
+ RateLimit-Remaining: '1994'
+ RateLimit-Reset: '1628159039'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:59 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCVJMNKHZ1R0RPP6KWZK5
+ X-Runtime: '0.215979'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/78/merge_ref:
+ - metadata:
+ latency: 0.37462830543518066
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.services.gitlab.pull_request
+ - gitlab.cli
+ - gitlab.exceptions
+ - gitlab.v4.objects.merge_requests
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ commit_id: 4862b886448876717a36e4a3b4a17183abb9d4e0
+ _next: null
+ elapsed: 0.372634
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4eb92bdcdfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:23:00 GMT
+ Etag: W/"b26ca8e67d30458a609640e41df81bfe"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-13-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '7'
+ RateLimit-Remaining: '1993'
+ RateLimit-Reset: '1628159040'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:24:00 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCW0S2B912M00G2TXD5WB
+ X-Runtime: '0.152086'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/79:
+ - metadata:
+ latency: 0.36863231658935547
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ allow_collaboration: false
+ allow_maintainer_to_push: false
+ approvals_before_merge: null
+ assignee: null
+ assignees: []
+ author:
+ avatar_url: https://secure.gravatar.com/avatar/eff1ae69a40d35559a382d36b53b72d2?s=80&d=identicon
+ id: 2952463
+ name: Jiri Popelka
+ state: active
+ username: jpopelka
+ web_url: https://gitlab.com/jpopelka
+ blocking_discussions_resolved: true
+ changes_count: '1'
+ closed_at: '2021-08-03T15:01:44.866Z'
+ closed_by:
+ avatar_url: https://secure.gravatar.com/avatar/eff1ae69a40d35559a382d36b53b72d2?s=80&d=identicon
+ id: 2952463
+ name: Jiri Popelka
+ state: active
+ username: jpopelka
+ web_url: https://gitlab.com/jpopelka
+ created_at: '2021-06-24T12:21:59.290Z'
+ description: This MR can't be merged because of a conflict.
+ diff_refs:
+ base_sha: b8e18207cfdad954f1b3a96db34d0706b272e6cf
+ head_sha: 45e3737aea87a9fd14adcf6a42070cb4f8665ada
+ start_sha: dd9b6c54c0788301c86bdf058a8e91e3594a0a17
+ discussion_locked: null
+ downvotes: 0
+ draft: false
+ first_contribution: false
+ first_deployed_to_production_at: null
+ force_remove_source_branch: true
+ has_conflicts: true
+ head_pipeline: null
+ id: 105673770
+ iid: 79
+ labels: []
+ latest_build_finished_at: null
+ latest_build_started_at: null
+ merge_commit_sha: null
+ merge_error: null
+ merge_status: cannot_be_merged
+ merge_when_pipeline_succeeds: false
+ merged_at: null
+ merged_by: null
+ milestone: null
+ pipeline: null
+ project_id: 14233409
+ reference: '!79'
+ references:
+ full: packit-service/ogr-tests!79
+ relative: '!79'
+ short: '!79'
+ reviewers: []
+ sha: 45e3737aea87a9fd14adcf6a42070cb4f8665ada
+ should_remove_source_branch: null
+ source_branch: create-conflict
+ source_project_id: null
+ squash: false
+ squash_commit_sha: null
+ state: closed
+ subscribed: false
+ target_branch: master
+ target_project_id: 14233409
+ task_completion_status:
+ completed_count: 0
+ count: 0
+ time_stats:
+ human_time_estimate: null
+ human_total_time_spent: null
+ time_estimate: 0
+ total_time_spent: 0
+ title: Conflict
+ updated_at: '2021-08-03T15:01:44.485Z'
+ upvotes: 0
+ user:
+ can_merge: true
+ user_notes_count: 0
+ web_url: https://gitlab.com/packit-service/ogr-tests/-/merge_requests/79
+ work_in_progress: false
+ _next: null
+ elapsed: 0.36602
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ec0589bdfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:23:01 GMT
+ Etag: W/"26a74ca3a9609d5a2d8f33e4f8535220"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-17-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '9'
+ RateLimit-Remaining: '1991'
+ RateLimit-Reset: '1628159041'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:24:01 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCX55KERDHRA1XJW9W6A4
+ X-Runtime: '0.100118'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/projects/14233409/merge_requests/79/merge_ref:
+ - metadata:
+ latency: 0.26976466178894043
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.services.gitlab.pull_request
+ - gitlab.cli
+ - gitlab.exceptions
+ - gitlab.v4.objects.merge_requests
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ message: Merge request is not mergeable
+ _next: null
+ elapsed: 0.268682
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ec26c65dfd3-FRA
+ Cache-Control: no-cache
+ Connection: keep-alive
+ Content-Length: '44'
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:23:01 GMT
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-18-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '10'
+ RateLimit-Remaining: '1990'
+ RateLimit-Reset: '1628159041'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:24:01 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCXEXXE99ZFYE37Z5CAZY
+ X-Runtime: '0.052650'
+ raw: !!binary ""
+ reason: Bad Request
+ status_code: 400
+ https://gitlab.com/api/v4/projects/packit-service%2Fogr-tests:
+ - metadata:
+ latency: 0.6322100162506104
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - ogr.services.gitlab.project
+ - gitlab.v4.objects.projects
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ _links:
+ events: https://gitlab.com/api/v4/projects/14233409/events
+ issues: https://gitlab.com/api/v4/projects/14233409/issues
+ labels: https://gitlab.com/api/v4/projects/14233409/labels
+ members: https://gitlab.com/api/v4/projects/14233409/members
+ merge_requests: https://gitlab.com/api/v4/projects/14233409/merge_requests
+ repo_branches: https://gitlab.com/api/v4/projects/14233409/repository/branches
+ self: https://gitlab.com/api/v4/projects/14233409
+ allow_merge_on_skipped_pipeline: null
+ analytics_access_level: enabled
+ approvals_before_merge: 0
+ archived: false
+ auto_cancel_pending_pipelines: enabled
+ auto_devops_deploy_strategy: continuous
+ auto_devops_enabled: false
+ autoclose_referenced_issues: true
+ avatar_url: null
+ build_coverage_regex: null
+ build_git_strategy: fetch
+ build_timeout: 3600
+ builds_access_level: enabled
+ can_create_merge_request_in: true
+ ci_config_path: null
+ ci_default_git_depth: 50
+ ci_forward_deployment_enabled: null
+ ci_job_token_scope_enabled: false
+ compliance_frameworks: []
+ container_registry_access_level: enabled
+ container_registry_enabled: true
+ container_registry_image_prefix: registry.gitlab.com/packit-service/ogr-tests
+ created_at: '2019-09-10T10:28:09.946Z'
+ creator_id: 433670
+ default_branch: master
+ description: Testing repository for python-ogr package. | https://github.com/packit-service/ogr
+ emails_disabled: null
+ empty_repo: false
+ external_authorization_classification_label: ''
+ forking_access_level: enabled
+ forks_count: 7
+ http_url_to_repo: https://gitlab.com/packit-service/ogr-tests.git
+ id: 14233409
+ import_error: null
+ import_status: none
+ issues_access_level: enabled
+ issues_enabled: true
+ issues_template: null
+ jobs_enabled: true
+ keep_latest_artifact: true
+ last_activity_at: '2021-08-05T09:29:28.037Z'
+ lfs_enabled: true
+ marked_for_deletion_at: null
+ marked_for_deletion_on: null
+ merge_method: merge
+ merge_pipelines_enabled: false
+ merge_requests_access_level: enabled
+ merge_requests_enabled: true
+ merge_requests_template: null
+ merge_trains_enabled: false
+ mirror: false
+ name: ogr-tests
+ name_with_namespace: packit-service / ogr-tests
+ namespace:
+ avatar_url: /uploads/-/system/group/avatar/6032704/logo-square-small-borders.png
+ full_path: packit-service
+ id: 6032704
+ kind: group
+ name: packit-service
+ parent_id: null
+ path: packit-service
+ web_url: https://gitlab.com/groups/packit-service
+ only_allow_merge_if_all_discussions_are_resolved: false
+ only_allow_merge_if_pipeline_succeeds: false
+ open_issues_count: 68
+ operations_access_level: enabled
+ packages_enabled: true
+ pages_access_level: enabled
+ path: ogr-tests
+ path_with_namespace: packit-service/ogr-tests
+ permissions:
+ group_access:
+ access_level: 50
+ notification_level: 3
+ project_access: null
+ printing_merge_request_link_enabled: true
+ public_jobs: true
+ readme_url: https://gitlab.com/packit-service/ogr-tests/-/blob/master/README.md
+ remove_source_branch_after_merge: null
+ repository_access_level: enabled
+ request_access_enabled: false
+ requirements_enabled: true
+ resolve_outdated_diff_discussions: false
+ restrict_user_defined_variables: false
+ runners_token: VjGdzzwZbsTY37sxUeWL
+ security_and_compliance_enabled: true
+ service_desk_address: incoming+packit-service-ogr-tests-14233409-issue-@incoming.gitlab.com
+ service_desk_enabled: true
+ shared_runners_enabled: true
+ shared_with_groups: []
+ snippets_access_level: enabled
+ snippets_enabled: true
+ squash_option: default_off
+ ssh_url_to_repo: git@gitlab.com:packit-service/ogr-tests.git
+ star_count: 0
+ suggestion_commit_message: null
+ tag_list: []
+ topics: []
+ visibility: public
+ web_url: https://gitlab.com/packit-service/ogr-tests
+ wiki_access_level: enabled
+ wiki_enabled: true
+ _next: null
+ elapsed: 0.630241
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4ea1fbe5dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:56 GMT
+ Etag: W/"694a7061c85cdc1d59b68d9195108fa4"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-13-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '1'
+ RateLimit-Remaining: '1999'
+ RateLimit-Reset: '1628159036'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:56 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCRJ2MKWS67P696WDV646
+ X-Runtime: '0.117619'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
+ https://gitlab.com/api/v4/user:
+ - metadata:
+ latency: 0.3001220226287842
+ module_call_list:
+ - unittest.case
+ - requre.record_and_replace
+ - tests.integration.gitlab.test_pull_requests
+ - ogr.utils
+ - ogr.services.gitlab.pull_request
+ - ogr.services.gitlab.project
+ - ogr.services.gitlab.service
+ - gitlab.client
+ - gitlab.exceptions
+ - gitlab.mixins
+ - gitlab.client
+ - requre.objects
+ - requre.cassette
+ - requests.sessions
+ - send
+ output:
+ __store_indicator: 2
+ _content:
+ avatar_url: https://gitlab.com/uploads/-/system/user/avatar/375555/avatar.png
+ bio: CS student @ FI MUNI (also tutoring), working in Red Hat. Fan of
+ open-source, Haskell, functional programming, containers and Linux.
+ bio_html: CS student @ FI MUNI
+ (also tutoring), working in Red Hat. Fan of open-source, Haskell, functional
+ programming, containers and Linux.
+ bot: false
+ can_create_group: true
+ can_create_project: true
+ color_scheme_id: 2
+ commit_email: matej.focko@outlook.com
+ confirmed_at: '2020-07-24T20:00:33.764Z'
+ created_at: '2016-01-15T21:12:31.705Z'
+ current_sign_in_at: '2021-08-02T15:58:36.283Z'
+ email: matej.focko@outlook.com
+ external: false
+ extra_shared_runners_minutes_limit: null
+ followers: 0
+ following: 0
+ id: 375555
+ identities:
+ - extern_uid: 46bd3cb0-73a0-11ea-8e0e-0a58ac142609
+ provider: group_saml
+ saml_provider_id: 1769
+ - extern_uid: '8149784'
+ provider: github
+ saml_provider_id: null
+ - extern_uid: '90177795'
+ provider: twitter
+ saml_provider_id: null
+ - extern_uid: '104088596414930556092'
+ provider: google_oauth2
+ saml_provider_id: null
+ job_title: ''
+ last_activity_on: '2021-08-05'
+ last_sign_in_at: '2021-07-19T09:54:27.845Z'
+ linkedin: mfocko
+ location: Brno, Czechia
+ name: Matej Focko
+ organization: Red Hat
+ private_profile: false
+ projects_limit: 100000
+ pronouns: ''
+ public_email: ''
+ shared_runners_minutes_limit: 2000
+ skype: ''
+ state: active
+ theme_id: 11
+ twitter: MatejFocko
+ two_factor_enabled: true
+ username: mfocko
+ web_url: https://gitlab.com/mfocko
+ website_url: https://me.mfocko.xyz
+ work_information: Red Hat
+ _next: null
+ elapsed: 0.299018
+ encoding: utf-8
+ headers:
+ CF-Cache-Status: DYNAMIC
+ CF-RAY: 679f4e9f6fa1dfd3-FRA
+ Cache-Control: max-age=0, private, must-revalidate
+ Connection: keep-alive
+ Content-Encoding: gzip
+ Content-Type: application/json
+ Date: Thu, 05 Aug 2021 10:22:56 GMT
+ Etag: W/"7917511161186a6ba204a97ce3181d02"
+ Expect-CT: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+ GitLab-LB: fe-02-lb-gprd
+ GitLab-SV: localhost
+ RateLimit-Limit: '2000'
+ RateLimit-Observed: '1'
+ RateLimit-Remaining: '1999'
+ RateLimit-Reset: '1628159036'
+ RateLimit-ResetTime: Thu, 05 Aug 2021 10:23:56 GMT
+ Referrer-Policy: strict-origin-when-cross-origin
+ Server: cloudflare
+ Strict-Transport-Security: max-age=31536000
+ Transfer-Encoding: chunked
+ Vary: Origin
+ X-Content-Type-Options: nosniff
+ X-Frame-Options: SAMEORIGIN
+ X-Request-Id: 01FCAXCR05TKVPQTQZKQ9P0F3D
+ X-Runtime: '0.035951'
+ raw: !!binary ""
+ reason: OK
+ status_code: 200
diff --git a/tests/integration/gitlab/test_pull_requests.py b/tests/integration/gitlab/test_pull_requests.py
index d99ae510b..c06587613 100644
--- a/tests/integration/gitlab/test_pull_requests.py
+++ b/tests/integration/gitlab/test_pull_requests.py
@@ -175,19 +175,39 @@ def test_head_commit(self):
)
def test_merge_commit_sha(self):
- pr1 = self.project.get_pr(1)
- pr12 = self.project.get_pr(12)
- pr19 = self.project.get_pr(19)
- pr79 = self.project.get_pr(79)
- assert pr1.merge_commit_sha == "101a42bbbe174d04b465d49caf274dc3b4defeca"
- assert pr1.merge_commit_status == MergeCommitStatus.can_be_merged
- assert pr12.merge_commit_sha == "f6de56d97ec3ec74cd5194e79175162d9f969195"
- assert pr12.merge_commit_status == MergeCommitStatus.can_be_merged
- assert pr19.merge_commit_sha == "b8e18207cfdad954f1b3a96db34d0706b272e6cf"
- assert pr19.merge_commit_status == MergeCommitStatus.can_be_merged
- assert pr79.head_commit == "45e3737aea87a9fd14adcf6a42070cb4f8665ada"
- assert pr79.merge_commit_sha is None
- assert pr79.merge_commit_status == MergeCommitStatus.cannot_be_merged
+ # merged PR
+ merged = self.project.get_pr(1)
+ assert merged.merge_commit_status == MergeCommitStatus.can_be_merged
+ assert merged.merge_commit_sha == "101a42bbbe174d04b465d49caf274dc3b4defeca"
+
+ def test_test_merge_commit_sha(self):
+ # open PR with no conflicts
+ open_mergeable = self.project.get_pr(77)
+ assert open_mergeable.merge_commit_status == MergeCommitStatus.can_be_merged
+ try:
+ assert open_mergeable.merge_commit_sha # cannot provide specific value
+ except AttributeError:
+ self.skipTest(
+ "installed version of python-gitlab does not support merge_ref"
+ )
+
+ # open PR with conflicts
+ conflicting = self.project.get_pr(25)
+ assert conflicting.merge_commit_status == MergeCommitStatus.cannot_be_merged
+ assert conflicting.merge_commit_sha is None
+
+ # closed PR with no conflicts
+ closed = self.project.get_pr(78)
+ assert closed.merge_commit_status == MergeCommitStatus.can_be_merged
+ assert closed.merge_commit_sha
+
+ # closed PR with conflicts
+ closed_with_conflict = self.project.get_pr(79)
+ assert (
+ closed_with_conflict.merge_commit_status
+ == MergeCommitStatus.cannot_be_merged
+ )
+ assert closed_with_conflict.merge_commit_sha is None
def test_source_project_upstream_branch(self):
pr = self.project.get_pr(23)