Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos.toolbox
Commits
8b3d3510
Commit
8b3d3510
authored
Dec 30, 2019
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
promise: Provide clickable urls in check_surykatka_json
parent
213b3beb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
slapos/promise/plugin/check_surykatka_json.py
slapos/promise/plugin/check_surykatka_json.py
+2
-2
slapos/test/promise/plugin/test_check_surykatka_json.py
slapos/test/promise/plugin/test_check_surykatka_json.py
+3
-3
No files found.
slapos/promise/plugin/check_surykatka_json.py
View file @
8b3d3510
...
@@ -147,7 +147,7 @@ class RunPromise(GenericPromise):
...
@@ -147,7 +147,7 @@ class RunPromise(GenericPromise):
entry_list
=
[
q
for
q
in
self
.
surykatka_json
[
key
]
if
q
[
'url'
]
==
url
]
entry_list
=
[
q
for
q
in
self
.
surykatka_json
[
key
]
if
q
[
'url'
]
==
url
]
if
len
(
entry_list
)
==
0
:
if
len
(
entry_list
)
==
0
:
logError
(
'No data for %
r
'
,
url
)
logError
(
'No data for %
s
'
,
url
)
return
return
error_list
=
[]
error_list
=
[]
for
entry
in
entry_list
:
for
entry
in
entry_list
:
...
@@ -162,7 +162,7 @@ class RunPromise(GenericPromise):
...
@@ -162,7 +162,7 @@ class RunPromise(GenericPromise):
'expected IPs %s differes from got %s'
%
(
'expected IPs %s differes from got %s'
%
(
' '
.
join
(
ip_list
),
' '
.
join
(
db_ip_list
)))
' '
.
join
(
ip_list
),
' '
.
join
(
db_ip_list
)))
if
len
(
error_list
):
if
len
(
error_list
):
logError
(
'Problem with %s: '
%
(
url
,)
+
', '
.
join
(
error_list
))
logError
(
'Problem with %s
: '
%
(
url
,)
+
', '
.
join
(
error_list
))
return
return
if
len
(
ip_list
)
>
0
:
if
len
(
ip_list
)
>
0
:
self
.
appendInfo
(
self
.
appendInfo
(
...
...
slapos/test/promise/plugin/test_check_surykatka_json.py
View file @
8b3d3510
...
@@ -375,7 +375,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
...
@@ -375,7 +375,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
self
.
launcher
.
run
()
self
.
launcher
.
run
()
self
.
assertFailedMessage
(
self
.
assertFailedMessage
(
self
.
getPromiseResult
(
self
.
promise_name
),
self
.
getPromiseResult
(
self
.
promise_name
),
"http_query: Problem with https://www.erp5.com/: IP 127.0.0.1 got "
"http_query: Problem with https://www.erp5.com/
: IP 127.0.0.1 got "
"status code 302 instead of 301 ssl_certificate: Certificate for "
"status code 302 instead of 301 ssl_certificate: Certificate for "
"https://www.erp5.com/ will expire on Mon, 13 Jul 2020 12:00:00 "
"https://www.erp5.com/ will expire on Mon, 13 Jul 2020 12:00:00 "
"-0000, which is more than 15 days, UTC now is Fri, 27 Dec 2019 "
"-0000, which is more than 15 days, UTC now is Fri, 27 Dec 2019 "
...
@@ -435,7 +435,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
...
@@ -435,7 +435,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
self
.
launcher
.
run
()
self
.
launcher
.
run
()
self
.
assertFailedMessage
(
self
.
assertFailedMessage
(
self
.
getPromiseResult
(
self
.
promise_name
),
self
.
getPromiseResult
(
self
.
promise_name
),
"http_query: Problem with https://www.erp5.com/: expected IPs "
"http_query: Problem with https://www.erp5.com/
: expected IPs "
"127.0.0.1 127.0.0.2 differes from got 127.0.0.1 127.0.0.4 "
"127.0.0.1 127.0.0.2 differes from got 127.0.0.1 127.0.0.4 "
"ssl_certificate: Certificate for https://www.erp5.com/ will expire "
"ssl_certificate: Certificate for https://www.erp5.com/ will expire "
"on Mon, 13 Jul 2020 12:00:00 -0000, which is more than 15 days, "
"on Mon, 13 Jul 2020 12:00:00 -0000, which is more than 15 days, "
...
@@ -495,7 +495,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
...
@@ -495,7 +495,7 @@ class TestCheckSurykatkaJSONHttpQuery(CheckSurykatkaJSONMixin):
self
.
launcher
.
run
()
self
.
launcher
.
run
()
self
.
assertFailedMessage
(
self
.
assertFailedMessage
(
self
.
getPromiseResult
(
self
.
promise_name
),
self
.
getPromiseResult
(
self
.
promise_name
),
"http_query: Problem with https://www.erp5.com/: IP 127.0.0.1 got "
"http_query: Problem with https://www.erp5.com/
: IP 127.0.0.1 got "
"status code 302 instead of 301, expected IPs 127.0.0.1 127.0.0.2 "
"status code 302 instead of 301, expected IPs 127.0.0.1 127.0.0.2 "
"differes from got 127.0.0.1 127.0.0.4 ssl_certificate: Certificate "
"differes from got 127.0.0.1 127.0.0.4 ssl_certificate: Certificate "
"for https://www.erp5.com/ will expire on Mon, 13 Jul 2020 12:00:00 "
"for https://www.erp5.com/ will expire on Mon, 13 Jul 2020 12:00:00 "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment