diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2014-03-22 15:40:42 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2014-03-22 15:40:42 -0400 |
| commit | 760f827ba0257d6664f429a832d1962fcac6e58e (patch) | |
| tree | 1bb6ca15ffbcc6bdabfeb43d9704a801ea2a6ab9 | |
| parent | fa340595746ba18fae3c6422ff4c9ea4af8e3023 (diff) | |
| download | gitlab-ce-760f827ba0257d6664f429a832d1962fcac6e58e.tar.gz | |
Remove code that does nothing
ping @karlhungus
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 1 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 9e3c3997e55..bdfcf254e9e 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -24,7 +24,6 @@ module Gitlab def clear_and_update! raise SatelliteNotExistError unless exists? - File.exists? path @repo = nil clear_working_dir! delete_heads! diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index e2c3f648ccf..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 @@ -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 |