Commit 2cf296ca authored by Dan Davison's avatar Dan Davison

Merge branch 'jsl-unquarantine-geo-lfs-specs' into 'master'

Unquarantine Geo LFS specs

Closes #212632

See merge request gitlab-org/gitlab!32629
parents c12d38f4 c1f3e272
...@@ -14,7 +14,7 @@ module QA ...@@ -14,7 +14,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for http push'
end end
# Perform a git push over HTTP directly to the primary # Perform a git push over HTTP directly to the primary
...@@ -60,8 +60,7 @@ module QA ...@@ -60,8 +60,7 @@ module QA
end end
context 'git-lfs commit' do context 'git-lfs commit' do
it 'is replicated to the secondary', quarantine: it 'is replicated to the secondary' do
{ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212632', type: :bug } do
file_content = 'This is a Geo project!' file_content = 'This is a Geo project!'
lfs_file_display_message = 'The rendered file could not be displayed because it is stored in LFS.' lfs_file_display_message = 'The rendered file could not be displayed because it is stored in LFS.'
project = nil project = nil
...@@ -69,7 +68,7 @@ module QA ...@@ -69,7 +68,7 @@ module QA
QA::Flow::Login.while_signed_in(address: :geo_primary) do QA::Flow::Login.while_signed_in(address: :geo_primary) do
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for http lfs push'
end end
# Perform a git push over HTTP directly to the primary # Perform a git push over HTTP directly to the primary
......
...@@ -17,7 +17,7 @@ module QA ...@@ -17,7 +17,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for http push to 2nd'
end end
# Perform a git push over HTTP directly to the primary # Perform a git push over HTTP directly to the primary
...@@ -89,8 +89,7 @@ module QA ...@@ -89,8 +89,7 @@ module QA
end end
context 'git-lfs commit' do context 'git-lfs commit' do
it 'is redirected to the primary and ultimately replicated to the secondary', quarantine: it 'is redirected to the primary and ultimately replicated to the secondary' do
{ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212632', type: :bug } do
file_name_primary = 'README.md' file_name_primary = 'README.md'
file_name_secondary = 'README_MORE.md' file_name_secondary = 'README_MORE.md'
project = nil project = nil
...@@ -99,7 +98,7 @@ module QA ...@@ -99,7 +98,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for http lfs push to 2nd'
end end
# Perform a git push over HTTP directly to the primary # Perform a git push over HTTP directly to the primary
......
...@@ -21,7 +21,7 @@ module QA ...@@ -21,7 +21,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for ssh push'
end end
# Perform a git push over SSH directly to the primary # Perform a git push over SSH directly to the primary
...@@ -75,8 +75,7 @@ module QA ...@@ -75,8 +75,7 @@ module QA
end end
context 'git-lfs commit' do context 'git-lfs commit' do
it "is replicated to the secondary", quarantine: it "is replicated to the secondary" do
{ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212632', type: :bug } do
key_title = "key for ssh tests #{Time.now.to_f}" key_title = "key for ssh tests #{Time.now.to_f}"
file_content = 'The rendered file could not be displayed because it is stored in LFS.' file_content = 'The rendered file could not be displayed because it is stored in LFS.'
project = nil project = nil
...@@ -91,7 +90,7 @@ module QA ...@@ -91,7 +90,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for ssh lfs push'
end end
# Perform a git push over SSH directly to the primary # Perform a git push over SSH directly to the primary
......
...@@ -22,7 +22,7 @@ module QA ...@@ -22,7 +22,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for ssh push to 2nd'
end end
# Perform a git push over SSH directly to the primary # Perform a git push over SSH directly to the primary
...@@ -96,8 +96,7 @@ module QA ...@@ -96,8 +96,7 @@ module QA
end end
context 'git-lfs commit' do context 'git-lfs commit' do
it 'is proxied to the primary and ultimately replicated to the secondary', quarantine: it 'is proxied to the primary and ultimately replicated to the secondary' do
{ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212632', type: :bug } do
key_title = "key for ssh tests #{Time.now.to_f}" key_title = "key for ssh tests #{Time.now.to_f}"
file_name_primary = 'README.md' file_name_primary = 'README.md'
file_name_secondary = 'README_MORE.md' file_name_secondary = 'README_MORE.md'
...@@ -113,7 +112,7 @@ module QA ...@@ -113,7 +112,7 @@ module QA
# Create a new Project # Create a new Project
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'geo-project' project.name = 'geo-project'
project.description = 'Geo test project' project.description = 'Geo test project for ssh lfs push to 2nd'
end end
# Perform a git push over SSH directly to the primary # Perform a git push over SSH directly to the primary
......
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