diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-06 16:23:40 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-06 16:23:40 +0200 |
| commit | 3cda57b4abee016c35867760ffd07c7b9c93e041 (patch) | |
| tree | bc8af74a1e580842abb0a0e7df7575fcce667c60 | |
| parent | 606e9cefd881313043f6a8f4bf39fb0d798e22f5 (diff) | |
| download | gitlab-ce-3cda57b4abee016c35867760ffd07c7b9c93e041.tar.gz | |
Actually clean gitlab-test path when TestEnv.set_repo_refs fails
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | spec/support/test_env.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 72b3b226c1e..3f472e59c49 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -54,6 +54,8 @@ module TestEnv 'conflict-resolvable-fork' => '404fa3f' }.freeze + TMP_TEST_PATH = Rails.root.join('tmp', 'tests', '**') + # Test environment # # See gitlab.yml.example test section for paths @@ -98,9 +100,7 @@ module TestEnv # # Keeps gitlab-shell and gitlab-test def clean_test_path - tmp_test_path = Rails.root.join('tmp', 'tests', '**') - - Dir[tmp_test_path].each do |entry| + Dir[TMP_TEST_PATH].each do |entry| unless File.basename(entry) =~ /\A(gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/ FileUtils.rm_rf(entry) end @@ -111,6 +111,14 @@ module TestEnv FileUtils.mkdir_p(pages_path) end + 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/ + FileUtils.rm_rf(entry) + end + end + end + def setup_gitlab_shell unless File.directory?(Gitlab.config.gitlab_shell.path) unless system('rake', 'gitlab:shell:install') @@ -249,7 +257,7 @@ module TestEnv # Before we used Git clone's --mirror option, bare repos could end up # with missing refs, clearing them and retrying should fix the issue. - cleanup && init unless reset.call + cleanup && clean_gitlab_test_path && init unless reset.call end end |