Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6eb9e981
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6eb9e981
编写于
5月 04, 2017
作者:
J
Jose Ivan Vargas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improved changelog entry, also changed error message for HTTParty error
上级
64e81195
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
changelogs/unreleased/prometheus-integration-test-setting-fix.yml
...gs/unreleased/prometheus-integration-test-setting-fix.yml
+1
-1
lib/gitlab/prometheus.rb
lib/gitlab/prometheus.rb
+1
-1
spec/lib/gitlab/prometheus_spec.rb
spec/lib/gitlab/prometheus_spec.rb
+1
-1
未找到文件。
changelogs/unreleased/prometheus-integration-test-setting-fix.yml
浏览文件 @
6eb9e981
---
---
title
:
Added rescue block for the test method
title
:
Prevent 500 errors caused by testing the Prometheus service
merge_request
:
10994
merge_request
:
10994
author
:
author
:
lib/gitlab/prometheus.rb
浏览文件 @
6eb9e981
...
@@ -55,7 +55,7 @@ module Gitlab
...
@@ -55,7 +55,7 @@ module Gitlab
rescue
OpenSSL
::
SSL
::
SSLError
rescue
OpenSSL
::
SSL
::
SSLError
raise
PrometheusError
,
"
#{
url
}
contains invalid SSL data"
raise
PrometheusError
,
"
#{
url
}
contains invalid SSL data"
rescue
HTTParty
::
Error
rescue
HTTParty
::
Error
raise
PrometheusError
,
"
An error has ocurred
"
raise
PrometheusError
,
"
Network connection error
"
end
end
def
handle_response
(
response
)
def
handle_response
(
response
)
...
...
spec/lib/gitlab/prometheus_spec.rb
浏览文件 @
6eb9e981
...
@@ -73,7 +73,7 @@ describe Gitlab::Prometheus, lib: true do
...
@@ -73,7 +73,7 @@ describe Gitlab::Prometheus, lib: true do
req_stub
=
stub_prometheus_request_with_exception
(
prometheus_url
,
HTTParty
::
Error
)
req_stub
=
stub_prometheus_request_with_exception
(
prometheus_url
,
HTTParty
::
Error
)
expect
{
subject
.
send
(
:get
,
prometheus_url
)
}
expect
{
subject
.
send
(
:get
,
prometheus_url
)
}
.
to
raise_error
(
Gitlab
::
PrometheusError
,
"
An error has ocurred
"
)
.
to
raise_error
(
Gitlab
::
PrometheusError
,
"
Network connection error
"
)
expect
(
req_stub
).
to
have_been_requested
expect
(
req_stub
).
to
have_been_requested
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录