Commit e5577afa authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Remove gitlab-shell from test setup

Gitaly absorbed the hooks of shell. Before Gitaly would still depend on
the GitLab Shell config. However, this code is only executed when the
hooks are executed. During the tests we don't as that would require the
internal API to run.

These things combined means we could effectively remove the setup off
shell before tests. This makes the setup of tests faster and a big more
smooth.
parent 2840e55c
...@@ -100,7 +100,6 @@ module TestEnv ...@@ -100,7 +100,6 @@ module TestEnv
clean_test_path clean_test_path
# Set up GitLab shell for test instance
setup_gitlab_shell setup_gitlab_shell
setup_gitaly setup_gitaly
...@@ -145,10 +144,7 @@ module TestEnv ...@@ -145,10 +144,7 @@ module TestEnv
end end
def setup_gitlab_shell def setup_gitlab_shell
component_timed_setup('GitLab Shell', FileUtils.mkdir_p(Gitlab.config.gitlab_shell.path)
install_dir: Gitlab.config.gitlab_shell.path,
version: Gitlab::Shell.version_required,
task: 'gitlab:shell:install')
end end
def setup_gitaly def setup_gitaly
......
...@@ -14,8 +14,10 @@ describe 'gitlab:shell rake tasks' do ...@@ -14,8 +14,10 @@ describe 'gitlab:shell rake tasks' do
storages = Gitlab::GitalyClient::StorageSettings.allow_disk_access do storages = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
Gitlab.config.repositories.storages.values.map(&:legacy_disk_path) Gitlab.config.repositories.storages.values.map(&:legacy_disk_path)
end end
expect(Kernel).to receive(:system).with('bin/install', *storages).and_call_original
expect(Kernel).to receive(:system).with('bin/compile').and_call_original expect_any_instance_of(Gitlab::TaskHelpers).to receive(:checkout_or_clone_version)
allow(Kernel).to receive(:system).with('bin/install', *storages).and_return(true)
allow(Kernel).to receive(:system).with('bin/compile').and_return(true)
run_rake_task('gitlab:shell:install') run_rake_task('gitlab:shell:install')
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