From 146b52bb749b8c3d5ddd403382c74ec11b06e869 Mon Sep 17 00:00:00 2001 From: Ramya Authappan Date: Wed, 10 Apr 2019 14:20:58 +0000 Subject: [PATCH] Merge branch 'tp-2019-04-08-quarantine' into 'master' Quarantine failing nightly tests See merge request gitlab-org/gitlab-ce!27174 (cherry picked from commit aa875163df0f1e386f3acdc8dda19de8a9183534) aa02f65e Quarantine failing nightly tests --- .../merge_request/merge_merge_request_from_fork_spec.rb | 3 ++- .../3_create/merge_request/squash_merge_request_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb index 6ca7af8a3af..c7db595284e 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module QA - context 'Create' do + # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/94 + context 'Create', :quarantine do describe 'Merge request creation from fork' do it 'user forks a project, submits a merge request and maintainer merges it' do Runtime::Browser.visit(:gitlab, Page::Main::Login) diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index f146636c49a..86692623790 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true module QA - # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31 - context 'Create' do + # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/93 + context 'Create', :quarantine do describe 'Merge request squashing' do it 'user squashes commits while merging' do Runtime::Browser.visit(:gitlab, Page::Main::Login) -- GitLab