Skip to content

Commit ce17c2b

Browse files
committed
chore: sleep for longer in cli_repo
1 parent c096e59 commit ce17c2b

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

tests/functional/cli/test_cli_repository.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,10 @@ def test_list_merge_request_commits(gitlab_cli, merge_request, project):
7979

8080
def test_commit_merge_requests(gitlab_cli, project, merge_request):
8181
# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
82-
time.sleep(5)
82+
time.sleep(30)
8383
logging.info(f"MR status: {merge_request.state}")
8484
logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
8585

86-
if merge_request.detailed_merge_status == "not_approved":
87-
logging.info("Approving Merge Request")
88-
89-
merge_request.approve()
90-
91-
logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
92-
time.sleep(5)
93-
9486
merge_result = merge_request.merge(should_remove_source_branch=True)
9587
# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
9688
time.sleep(5)

0 commit comments

Comments
 (0)