diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-05-02 20:32:46 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-05-02 20:32:46 +0000 |
| commit | b3890749c0fe9e7c20f2d96bbf3a43dd76653d92 (patch) | |
| tree | 8697bef70fb822966c5216154cb2b3ea708abf04 | |
| parent | 703856c75ee7eefbfb536db306eaeec4c4b35e02 (diff) | |
| parent | 1c49809bf89e6e0ebe869476044e9e6dda4a0545 (diff) | |
| download | gitlab-ce-b3890749c0fe9e7c20f2d96bbf3a43dd76653d92.tar.gz | |
Merge branch 'rs-test-env-fixes' into 'master'
Don't delete gitlab-test-fork folder after every test run
72a7febeada2c58c98caee8bb7ce18886a7c0868 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
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index d1844bd2b87..6d4a8067910 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -35,6 +35,7 @@ module TestEnv # Create repository for FactoryGirl.create(:project) setup_factory_repo + # Create repository for FactoryGirl.create(:forked_project_with_submodules) setup_forked_repo end @@ -54,7 +55,7 @@ module TestEnv tmp_test_path = Rails.root.join('tmp', 'tests', '**') 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) end end |