summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-03-26 17:22:55 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-03-26 17:22:55 +0000
commita00c00505e03f0e0d71f0106266747efe8e524dd (patch)
tree06986d0a5271f87a195a50b44a51d867d4c8d23c
parent67ece2efcd7e91485c47c4dbf0ed17ed87de0431 (diff)
parent60c28a5fe0fa0f93043f6037f68912c7803b6318 (diff)
downloadgitlab-ce-a00c00505e03f0e0d71f0106266747efe8e524dd.tar.gz
Merge branch 'zj-unify-ref-service-spec-ce-ee' into 'master'
GitalyClient spec: Remove the diff between CE/EE See merge request gitlab-org/gitlab-ce!26610
-rw-r--r--spec/lib/gitlab/gitaly_client/ref_service_spec.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/gitlab/gitaly_client/ref_service_spec.rb b/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
index 400d426c949..0dab39575b9 100644
--- a/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
@@ -89,6 +89,16 @@ describe Gitlab::GitalyClient::RefService do
end
end
+ describe '#list_new_blobs' do
+ it 'raises DeadlineExceeded when timeout is too small' do
+ newrev = '54fcc214b94e78d7a41a9a8fe6d87a5e59500e51'
+
+ expect do
+ client.list_new_blobs(newrev, dynamic_timeout: 0.001)
+ end.to raise_error(GRPC::DeadlineExceeded)
+ end
+ end
+
describe '#local_branches' do
it 'sends a find_local_branches message' do
expect_any_instance_of(Gitaly::RefService::Stub)