Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
inventory-provider
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
geant-swd
dashboardv3
inventory-provider
Commits
c7ed3546
Commit
c7ed3546
authored
3 years ago
by
Robert Latta
Browse files
Options
Downloads
Patches
Plain Diff
reduced logged message length
parent
6479bdc1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inventory_provider/db/ims.py
+11
-4
11 additions, 4 deletions
inventory_provider/db/ims.py
test/test_ims.py
+18
-0
18 additions, 0 deletions
test/test_ims.py
with
29 additions
and
4 deletions
inventory_provider/db/ims.py
+
11
−
4
View file @
c7ed3546
...
...
@@ -242,13 +242,20 @@ class IMS(object):
if
NO_FILTERED_RESULTS_MESSAGE
in
response_
.
text
.
lower
():
return
False
try
:
r
=
response_
.
json
()
r
=
_convert_keys
(
response_
.
json
()
)
except
Exception
as
e
:
logger
.
debug
(
f
"
unexpected response:
{
response_
.
text
}
"
)
t
=
response_
.
text
if
len
(
t
)
>
100
:
message_text
=
f
"
{
t
[
:
50
]
}
...
{
t
[
-
50
:
]
}
"
else
:
message_text
=
t
logger
.
debug
(
f
"
unexpected response:
{
message_text
}
\n
{
e
}
"
"
\n
re-raising
"
)
raise
e
if
r
and
'
H
as
E
rrors
'
in
r
and
r
[
'
H
as
E
rrors
'
]:
if
r
and
'
h
as
e
rrors
'
in
r
and
r
[
'
h
as
e
rrors
'
]:
for
e
in
r
[
'
Errors
'
]:
if
'
Guid expired
'
in
e
[
'
ErrorMessage
'
]:
if
e
[
'
errormessage
'
]
and
\
'
guid expired
'
in
e
[
'
errormessage
'
].
lower
():
return
True
return
False
...
...
This diff is collapsed.
Click to expand it.
test/test_ims.py
+
18
−
0
View file @
c7ed3546
from
requests
import
HTTPError
import
inventory_provider
from
inventory_provider.db.ims
import
IMSError
class
MockResponse
:
...
...
@@ -33,6 +34,23 @@ def test_ims_class_login(mocker):
params
=
None
)
def
test_ims_failed_response
(
mocker
):
mock_post
=
mocker
.
patch
(
'
inventory_provider.db.ims.requests.post
'
)
mock_post
.
return_value
=
MockResponse
(
"
my_bearer_token
"
,
200
)
mock_post
.
return_value
.
text
=
"
my_bearer_token
"
mock_get
=
mocker
.
patch
(
'
inventory_provider.db.ims.requests.get
'
)
mock_get
.
return_value
.
status_code
=
200
mock_get
.
return_value
.
json
.
side_effect
=
IMSError
(
"
IMS exception
"
)
ds
=
inventory_provider
.
db
.
ims
.
IMS
(
'
dummy_base
'
,
'
dummy_username
'
,
'
dummy_password
'
)
try
:
ds
.
get_entity_by_id
(
'
Node
'
,
1234
)
except
Exception
as
e
:
assert
isinstance
(
e
,
IMSError
)
def
test_ims_class_entity_by_id
(
mocker
):
mock_get
=
mocker
.
patch
(
'
inventory_provider.db.ims.requests.get
'
)
ds
=
inventory_provider
.
db
.
ims
.
IMS
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment