Skip to content

Commit

Permalink
Merge branch 'mainline' into dependabot/pip/ruff-eq-0.9.star
Browse files Browse the repository at this point in the history
  • Loading branch information
moorec-aws authored Feb 21, 2025
2 parents 4128c0a + 709a68d commit f3b49a7
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
Thank you for taking the time to fill out this bug report!
⚠️ If the bug that you are reporting is a security-related issue or security vulnerability,
then please do not create a report via this template. Instead please
then please do not create a report via this template. Instead please
notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
or directly via email to [AWS Security]([email protected]).
Expand Down Expand Up @@ -54,9 +54,9 @@ body:
description: Please provide information on the environment and software versions that you are using to reproduce the bug.
value: |
At minimum:
1. Operating system: (e.g. Windows Server 2022; Amazon Linux 2023; etc.)
2. Output of `python3 --version`:
3. Version of this library.
1. Operating system (e.g. Windows Server 2022; Amazon Linux 2023; etc.)
2. Output of `python3 --version`
3. Version of this library
Please share other details about your environment that you think might be relevant to reproducing the bug.
validations:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "📕 Documentation Issue"
description: Issue in the documentation
title: "Docs: (short description of the issue)"
labels: ["documenation", "needs triage"]
labels: ["documentation", "needs triage"]
body:
- type: textarea
id: documentation_issue
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "\U0001F680 Feature Request"
description: Request a new feature
title: "Feature request: (short description of the feature)"
labels: ["feature", "needs triage"]
labels: ["enhancement", "needs triage"]
body:
- type: textarea
id: problem
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/maintenance.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "🛠️ Maintenance"
description: Some type of improvement
title: "Maintenance: (short description of the issue)"
labels: ["feature", "needs triage"]
labels: ["maintenance", "needs triage"]
body:
- type: textarea
id: description
Expand Down
2 changes: 1 addition & 1 deletion requirements-development.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hatch == 1.13.*
hatch == 1.14.*
hatch-vcs == 0.4.*
2 changes: 1 addition & 1 deletion requirements-release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-semantic-release == 9.14.*
python-semantic-release == 9.20.*
2 changes: 1 addition & 1 deletion src/openjd/adaptor_runtime/_background/frontend_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def init(
)
args.extend(["--bootstrap-log-file", bootstrap_log_path])

_logger.debug(f"Running process with args: {args}")
_logger.info(f"Running process with args: {args}")
bootstrap_output_path = os.path.join(
bootstrap_log_dir, f"adaptor-runtime-background-bootstrap-output-{bootstrap_id}.log"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def test_start_stop(self, caplog: pytest.LogCaptureFixture, tmp_path: Path):
assert "Connected successfully" in caplog.text
assert "Running in background daemon mode." in caplog.text
assert "Daemon background process stopped." in caplog.text
assert "on_prerun" not in caplog.text
assert "on_postrun" not in caplog.text
assert "on_prerun" in caplog.text
assert "on_postrun" in caplog.text

def test_run(self, caplog: pytest.LogCaptureFixture, tmp_path: Path):
# GIVEN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,34 @@ def test_initializes_backend_process(
)
mock_heartbeat.assert_called_once()

def test_arguments_to_daemon_serve_are_logged_at_info_level(
self,
mock_path_exists: MagicMock,
mock_Popen: MagicMock,
caplog: pytest.LogCaptureFixture,
):
# GIVEN
caplog.set_level("INFO")
mock_path_exists.return_value = False
adaptor_module = ModuleType("")
adaptor_module.__package__ = "package"
conn_file_path = Path("/path")
runner = FrontendRunner()

# WHEN
runner.init(
adaptor_module=adaptor_module,
connection_file_path=conn_file_path,
)

# THEN
assert any(
"Running process with args" in captured_message
for captured_message in caplog.messages
)
mock_path_exists.assert_called_once_with()
mock_Popen.assert_called_once()

def test_raises_when_adaptor_module_not_package(self):
# GIVEN
adaptor_module = ModuleType("")
Expand Down

0 comments on commit f3b49a7

Please sign in to comment.