Commit 83da1103 authored by Andrejs Cunskis's avatar Andrejs Cunskis

Merge branch 'ml-update-flaky-test' into 'master'

Remove unnecessary check and aggregate failures

See merge request gitlab-org/gitlab!80246
parents 682e8c25 617a5704
......@@ -68,9 +68,10 @@ module QA
mr.iid = merge_request[:iid]
end
expect(merge_request.state).to eq('opened')
expect(merge_request.merge_status).to eq('checking')
expect(merge_request.merge_when_pipeline_succeeds).to be true
aggregate_failures do
expect(merge_request.state).to eq('opened')
expect(merge_request.merge_when_pipeline_succeeds).to be true
end
end
it 'merges when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347842' do
......
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