Fix failing specs
This commit is contained in:
parent
889c62c1e3
commit
7ea4a42395
1 changed files with 3 additions and 26 deletions
|
@ -49,14 +49,14 @@ describe Backup::Repository do
|
|||
|
||||
describe 'command failure' do
|
||||
before do
|
||||
allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
|
||||
allow_any_instance_of(Gitlab::Shell).to receive(:create_repository).and_return(false)
|
||||
end
|
||||
|
||||
context 'hashed storage' do
|
||||
it 'shows the appropriate error' do
|
||||
subject.restore
|
||||
|
||||
expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} (#{project.disk_path}) - error")
|
||||
expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -66,33 +66,10 @@ describe Backup::Repository do
|
|||
it 'shows the appropriate error' do
|
||||
subject.restore
|
||||
|
||||
expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
|
||||
expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'folders without permissions' do
|
||||
before do
|
||||
allow(FileUtils).to receive(:mv).and_raise(Errno::EACCES)
|
||||
end
|
||||
|
||||
it 'shows error message' do
|
||||
expect(subject).to receive(:access_denied_error)
|
||||
subject.restore
|
||||
end
|
||||
end
|
||||
|
||||
describe 'folder that is a mountpoint' do
|
||||
before do
|
||||
allow(FileUtils).to receive(:mv).and_raise(Errno::EBUSY)
|
||||
end
|
||||
|
||||
it 'shows error message' do
|
||||
expect(subject).to receive(:resource_busy_error).and_call_original
|
||||
|
||||
expect { subject.restore }.to raise_error(/is a mountpoint/)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#empty_repo?' do
|
||||
|
|
Loading…
Reference in a new issue