diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-07 15:14:39 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-07 15:14:39 +0000 |
| commit | 32ebd136f96fd1f97701ccc7575fd3be81c493d4 (patch) | |
| tree | 8aa4fd3f061cdc9115083627bdb1393dd1f856b9 /spec/gitlab_projects_spec.rb | |
| parent | ca7c80ce2a07a7e581fcf991b5ecc06b0e6224f9 (diff) | |
| parent | 47723a6872f5506c38c98386ef215a1aca8a690e (diff) | |
| download | gitlab-shell-32ebd136f96fd1f97701ccc7575fd3be81c493d4.tar.gz | |
Merge branch 'fix-ionice-again' into 'master'
Fix rsync with ionice command building
See merge request !97
Diffstat (limited to 'spec/gitlab_projects_spec.rb')
| -rw-r--r-- | spec/gitlab_projects_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/gitlab_projects_spec.rb b/spec/gitlab_projects_spec.rb index 149d53f..175c929 100644 --- a/spec/gitlab_projects_spec.rb +++ b/spec/gitlab_projects_spec.rb @@ -229,7 +229,7 @@ describe GitlabProjects do it "should attempt rsync with ionice first" do expect(gl_projects).to receive(:system).with( - 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', + 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', "#{tmp_repo_path}/", new_repo_path ).and_return(true) @@ -238,7 +238,7 @@ describe GitlabProjects do it "should attempt rsync without ionice if with ionice fails" do expect(gl_projects).to receive(:system).with( - 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', + 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', "#{tmp_repo_path}/", new_repo_path ).and_return(false) @@ -251,7 +251,7 @@ describe GitlabProjects do it "should fail if both rsync attempts fail" do expect(gl_projects).to receive(:system).with( - 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', + 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"', "#{tmp_repo_path}/", new_repo_path ).and_return(false) |