Merge branch 'gitaly-install-path' into 'master'

Remove storage path dependency of gitaly install task

See merge request gitlab-org/gitlab-ce!21101

1 files changed, 16 insertions, 51 deletions

diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 4545226d78c..e6e4d9504d9 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -8,13 +8,23 @@ describe 'gitlab:gitaly namespace rake task' do
   describe 'install' do
     let(:repo) { 'https://gitlab.com/gitlab-org/gitaly.git' }
     let(:clone_path) { Rails.root.join('tmp/tests/gitaly').to_s }
+    let(:storage_path) { Rails.root.join('tmp/tests/repositories').to_s }
     let(:version) { File.read(Rails.root.join(Gitlab::GitalyClient::SERVER_VERSION_FILE)).chomp }
 
+    subject { run_rake_task('gitlab:gitaly:install', clone_path, storage_path) }
+
     context 'no dir given' do
       it 'aborts and display a help message' do
         # avoid writing task output to spec progress
         allow($stderr).to receive :write
-        expect { run_rake_task('gitlab:gitaly:install') }.to raise_error /Please specify the directory where you want to install gitaly/
+        expect { run_rake_task('gitlab:gitaly:install') }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
+      end
+    end
+
+    context 'no storage path given' do
+      it 'aborts and display a help message' do
+        allow($stderr).to receive :write
+        expect { run_rake_task('gitlab:gitaly:install', clone_path) }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
       end
     end
 
@@ -23,7 +33,7 @@ describe 'gitlab:gitaly namespace rake task' do
         expect(main_object)
           .to receive(:checkout_or_clone_version).and_raise 'Git error'
 
-        expect { run_rake_task('gitlab:gitaly:install', clone_path) }.to raise_error 'Git error'
+        expect { subject }.to raise_error 'Git error'
       end
     end
 
@@ -36,7 +46,7 @@ describe 'gitlab:gitaly namespace rake task' do
         expect(main_object)
           .to receive(:checkout_or_clone_version).with(version: version, repo: repo, target_dir: clone_path)
 
-        run_rake_task('gitlab:gitaly:install', clone_path)
+        subject
       end
     end
 
@@ -59,7 +69,7 @@ describe 'gitlab:gitaly namespace rake task' do
           expect(Gitlab::Popen).to receive(:popen).with(%w[which gmake]).and_return(['/usr/bin/gmake', 0])
           expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake]).and_return(true)
 
-          run_rake_task('gitlab:gitaly:install', clone_path)
+          subject
         end
       end
 
@@ -72,7 +82,7 @@ describe 'gitlab:gitaly namespace rake task' do
         it 'calls make in the gitaly directory' do
           expect(main_object).to receive(:run_command!).with(command_preamble + %w[make]).and_return(true)
 
-          run_rake_task('gitlab:gitaly:install', clone_path)
+          subject
         end
 
         context 'when Rails.env is test' do
@@ -89,55 +99,10 @@ describe 'gitlab:gitaly namespace rake task' do
           it 'calls make in the gitaly directory with --no-deployment flag for bundle' do
             expect(main_object).to receive(:run_command!).with(command_preamble + command).and_return(true)
 
-            run_rake_task('gitlab:gitaly:install', clone_path)
+            subject
           end
         end
       end
     end
   end
-
-  describe 'storage_config' do
-    it 'prints storage configuration in a TOML format' do
-      config = {
-        'default' => Gitlab::GitalyClient::StorageSettings.new(
-          'path' => '/path/to/default',
-          'gitaly_address' => 'unix:/path/to/my.socket'
-        ),
-        'nfs_01' => Gitlab::GitalyClient::StorageSettings.new(
-          'path' => '/path/to/nfs_01',
-          'gitaly_address' => 'unix:/path/to/my.socket'
-        )
-      }
-      allow(Gitlab.config.repositories).to receive(:storages).and_return(config)
-      allow(Rails.env).to receive(:test?).and_return(false)
-
-      expected_output = ''
-      Timecop.freeze do
-        expected_output = <<~TOML
-          # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}
-          # This is in TOML format suitable for use in Gitaly's config.toml file.
-          bin_dir = "tmp/tests/gitaly"
-          socket_path = "/path/to/my.socket"
-          [gitlab-shell]
-          dir = "#{Gitlab.config.gitlab_shell.path}"
-          [[storage]]
-          name = "default"
-          path = "/path/to/default"
-          [[storage]]
-          name = "nfs_01"
-          path = "/path/to/nfs_01"
-        TOML
-      end
-
-      expect { run_rake_task('gitlab:gitaly:storage_config')}
-        .to output(expected_output).to_stdout
-
-      parsed_output = TomlRB.parse(expected_output)
-      config.each do |name, params|
-        Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          expect(parsed_output['storage']).to include({ 'name' => name, 'path' => params.legacy_disk_path })
-        end
-      end
-    end
-  end
 end