kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-6481-use-elasticsearch-indexer-in-specs' into 'master'

Browse source 
CE backport for "Use gitlab-elasticsearch-indexer in tests"

See merge request gitlab-org/gitlab-ce!28369
This commit is contained in:
Rémy Coutable 2019-05-20 10:07:59 +00:00
commit 801309308e
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GITLAB_ELASTICSEARCH_INDEXER_VERSION Normal file
View file

@ -0,0 +1 @@
1.1.0

14
spec/support/helpers/test_env.rb
View file

@ -135,7 +135,7 @@ module TestEnv
def clean_gitlab_test_path def clean_gitlab_test_path
Dir[TMP_TEST_PATH].each do |entry| Dir[TMP_TEST_PATH].each do |entry|
if File.basename(entry) =~ /\A(gitlab-(test|test_bare|test-fork|test-fork_bare))\z/ unless test_dirs.include?(File.basename(entry))
FileUtils.rm_rf(entry) FileUtils.rm_rf(entry)
end end
end end
@ -312,6 +312,18 @@ module TestEnv
private private
# These are directories that should be preserved at cleanup time
def test_dirs
@test_dirs ||= %w[
gitaly
gitlab-shell
gitlab-test
gitlab-test_bare
gitlab-test-fork
gitlab-test-fork_bare
]
end
def factory_repo_path def factory_repo_path
@factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name) @factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
end end