diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 18:32:59 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 18:32:59 +0300 |
commit | d92a8c1a5f9b061a10140239bed44b432b28abdf (patch) | |
tree | 4fcac30dba9434552377f729d4be7ad31fb22f99 /spec/lib | |
parent | ab509c78929d9b5f4e02d013e8911ac9d0a07aad (diff) | |
parent | 3b76d2982f2fdacdce5842c68ab3ba68b6cb7842 (diff) |
Merge branch 'sh-fix-gitaly-access-control' into 'master'
Fix exception handling in Gitaly autodetection
Closes #65328
See merge request gitlab-org/gitlab-ce!31285
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/gitaly_client_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb index e1d24ae8977..e9fb6c0125c 100644 --- a/spec/lib/gitlab/gitaly_client_spec.rb +++ b/spec/lib/gitlab/gitaly_client_spec.rb @@ -17,6 +17,16 @@ describe Gitlab::GitalyClient do }) end + describe '.filesystem_id_from_disk' do + it 'catches errors' do + [Errno::ENOENT, Errno::EACCES, JSON::ParserError].each do |error| + allow(File).to receive(:read).with(described_class.storage_metadata_file_path('default')).and_raise(error) + + expect(described_class.filesystem_id_from_disk('default')).to be_nil + end + end + end + describe '.stub_class' do it 'returns the gRPC health check stub' do expect(described_class.stub_class(:health_check)).to eq(::Grpc::Health::V1::Health::Stub) |