Commit b3890749 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-test-env-fixes' into 'master'

Don't delete gitlab-test-fork folder after every test run

72a7febe added a forked repository cloned to `tmp/tests/gitlab-test-fork` but because it wasn't added to the list of folders not to delete every run, it was being cloned every run and adding extraneous console output.

See merge request !600
parents 703856c7 1c49809b
...@@ -35,6 +35,7 @@ module TestEnv ...@@ -35,6 +35,7 @@ module TestEnv
# Create repository for FactoryGirl.create(:project) # Create repository for FactoryGirl.create(:project)
setup_factory_repo setup_factory_repo
# Create repository for FactoryGirl.create(:forked_project_with_submodules) # Create repository for FactoryGirl.create(:forked_project_with_submodules)
setup_forked_repo setup_forked_repo
end end
...@@ -54,7 +55,7 @@ module TestEnv ...@@ -54,7 +55,7 @@ module TestEnv
tmp_test_path = Rails.root.join('tmp', 'tests', '**') 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) =~ /\Agitlab-(shell|test)\z/ unless File.basename(entry) =~ /\Agitlab-(shell|test|test-fork)\z/
FileUtils.rm_rf(entry) FileUtils.rm_rf(entry)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment