summaryrefslogtreecommitdiff
path: root/spec/gitlab_keys_spec.rb
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2018-08-20 14:34:24 +1000
committerAsh McKenzie <amckenzie@gitlab.com>2018-09-07 15:09:50 +1000
commitddb95f0dd0463b884860238fd250092bffed0e78 (patch)
treedf56735a910d4bf1b98861ea736c3ba475741172 /spec/gitlab_keys_spec.rb
parentb0a526354eb012d2a2d874d22515d20c035ea5d6 (diff)
downloadgitlab-shell-ddb95f0dd0463b884860238fd250092bffed0e78.tar.gz
GitlabConfig, GitlabShell & GitlabKeys spec fixes
GitlabConfig spec was relying upon real config.yml
Diffstat (limited to 'spec/gitlab_keys_spec.rb')
-rw-r--r--spec/gitlab_keys_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb
index 87492d8..f86d00d 100644
--- a/spec/gitlab_keys_spec.rb
+++ b/spec/gitlab_keys_spec.rb
@@ -307,7 +307,7 @@ describe GitlabKeys do
key.send :lock, 1 do
sleep 2
end
- end.to raise_error
+ end.to raise_error(Timeout::Error, 'execution expired')
end
it "should actually lock file" do