Skip to content

Add hotfix changes #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 2 commits into from
Mar 19, 2024
Merged

Add hotfix changes #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1bb27
Add hotfix changes
jboddey Mar 13, 2024
ed11861
Merge branch 'dev' into hotfix/tls
jboddey Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions modules/test/base/python/src/test_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,10 @@ def run_tests(self):
else:
result = getattr(self, test_method_name)()
except Exception as e:
LOGGER.info(f'An error occurred whilst running {test["name"]}')
LOGGER.error(f'An error occurred whilst running {test["name"]}')
LOGGER.error(e)
return None
else:
LOGGER.info(f'Test {test["name"]} not implemented. Skipping')
result = None
else:
LOGGER.debug(f'Test {test["name"]} is disabled')

Expand Down
3 changes: 3 additions & 0 deletions modules/test/tls/python/src/tls_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ def get_public_certificate(self,
except ssl.SSLError as e:
LOGGER.info(f'SSL error occurred: {e}')
return None
except socket.timeout:
LOGGER.info('Socket timeout error')
return None

return cert_pem

Expand Down