From d2425716aa9f084d68fecae74688a3f6dac24ce2 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Thu, 16 May 2019 16:49:26 +0100
Subject: [PATCH] CE backport for "Use gitlab-elasticsearch-indexer in tests"
---
GITLAB_ELASTICSEARCH_INDEXER_VERSION | 1 +
spec/support/helpers/test_env.rb | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 GITLAB_ELASTICSEARCH_INDEXER_VERSION
diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
new file mode 100644
index 0000000000000..9084fa2f716a7
--- /dev/null
+++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
@@ -0,0 +1 @@
+1.1.0
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index dc902d373b8e4..06b5ecdf15036 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -135,7 +135,7 @@ def clean_test_path
def clean_gitlab_test_path
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)
end
end
@@ -312,6 +312,18 @@ def with_empty_bare_repository(name = nil)
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
@factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
end
--
GitLab