diff options
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 77a669c0cc1..d00decf6121 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -29,7 +29,6 @@ module TestEnv disable_mailer if opts[:mailer] == false setup_stubs - clear_test_repo_dir if opts[:init_repos] == true setup_test_repos(opts) if opts[:repos] == true end @@ -106,7 +105,7 @@ module TestEnv setup_stubs [ %W(git reset --hard --quiet), - %W(git clean -fx), + %W(git clean -fx --quiet), %W(git checkout --quiet origin/master) ].each do |git_cmd| system(*git_cmd, chdir: seed_satellite_path) @@ -165,8 +164,7 @@ module TestEnv def clear_test_repo_dir setup_stubs - # Use tmp dir for FS manipulations - repos_path = testing_path() + # Remove tmp/test-git-base-path FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path |