Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
36e0dc04
Commit
36e0dc04
authored
Mar 06, 2020
by
James Fargher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop test cleanup from deleting second_storage
parent
8e699fe9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
6 deletions
+1
-6
lib/gitlab/setup_helper.rb
lib/gitlab/setup_helper.rb
+0
-2
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+0
-2
spec/support/helpers/test_env.rb
spec/support/helpers/test_env.rb
+1
-2
No files found.
lib/gitlab/setup_helper.rb
View file @
36e0dc04
...
...
@@ -33,8 +33,6 @@ module Gitlab
if
Rails
.
env
.
test?
storage_path
=
Rails
.
root
.
join
(
'tmp'
,
'tests'
,
'second_storage'
).
to_s
FileUtils
.
mkdir
(
storage_path
)
unless
File
.
exist?
(
storage_path
)
storages
<<
{
name:
'test_second_storage'
,
path:
storage_path
}
end
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
36e0dc04
...
...
@@ -2152,8 +2152,6 @@ describe Gitlab::Git::Repository, :seed_helper do
'gitaly_address'
=>
Gitlab
.
config
.
repositories
.
storages
.
default
.
gitaly_address
,
'path'
=>
second_storage_path
})
# TODO: SetupHelper should be creating this
FileUtils
.
mkdir_p
(
"tmp/tests/second_storage"
)
unless
File
.
exist?
(
"tmp/tests/second_storage"
)
Gitlab
::
Shell
.
new
.
create_repository
(
'test_second_storage'
,
TEST_REPO_PATH
,
'group/project'
)
end
...
...
spec/support/helpers/test_env.rb
View file @
36e0dc04
...
...
@@ -141,6 +141,7 @@ module TestEnv
end
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
Rails
.
root
.
join
(
'tmp'
,
'tests'
,
'second_storage'
))
FileUtils
.
mkdir_p
(
backup_path
)
FileUtils
.
mkdir_p
(
pages_path
)
FileUtils
.
mkdir_p
(
artifacts_path
)
...
...
@@ -176,8 +177,6 @@ module TestEnv
return
end
FileUtils
.
mkdir_p
(
"tmp/tests/second_storage"
)
unless
File
.
exist?
(
"tmp/tests/second_storage"
)
spawn_script
=
Rails
.
root
.
join
(
'scripts/gitaly-test-spawn'
).
to_s
Bundler
.
with_original_env
do
unless
system
(
spawn_script
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment