From debcd1ddaf76def09ac14690c682c4dc29ee273b Mon Sep 17 00:00:00 2001 From: Warren Jones Date: Tue, 5 Apr 2022 10:20:12 -0700 Subject: [PATCH 1/3] Output job progress messages with Knack logger --- src/quantum/azext_quantum/operations/job.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/quantum/azext_quantum/operations/job.py b/src/quantum/azext_quantum/operations/job.py index ceb6a57ec69..74221e1183b 100644 --- a/src/quantum/azext_quantum/operations/job.py +++ b/src/quantum/azext_quantum/operations/job.py @@ -6,6 +6,7 @@ # pylint: disable=redefined-builtin,bare-except,inconsistent-return-statements import logging +import knack.log from azure.cli.core.azclierror import (FileOperationError, AzureInternalError, InvalidArgumentValueError, AzureResponseError) @@ -15,6 +16,7 @@ from .target import TargetInfo logger = logging.getLogger(__name__) +knack_logger = knack.log.get_logger(__name__) def list(cmd, resource_group_name=None, workspace_name=None, location=None): @@ -70,7 +72,7 @@ def build(cmd, target_id=None, project=None): logger.debug("Building project with arguments:") logger.debug(args) - print("Building project...") + knack_logger.warning('Building project...') import subprocess result = subprocess.run(args, stdout=subprocess.PIPE, check=False) @@ -183,7 +185,7 @@ def submit(cmd, program_args, resource_group_name=None, workspace_name=None, loc args = _generate_submit_args(program_args, ws, target, token, project, job_name, shots, storage, job_params) _set_cli_version() - print("Submitting job...") + knack_logger.warning('Submitting job...') import subprocess result = subprocess.run(args, stdout=subprocess.PIPE, check=False) From f228e0adb7c3e835c9cdd278ca66247b1afb7a6f Mon Sep 17 00:00:00 2001 From: Warren Jones Date: Tue, 5 Apr 2022 17:58:15 -0700 Subject: [PATCH 2/3] Update test_version_check --- .../azext_quantum/tests/latest/test_quantum_workspace.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py b/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py index 44e35e04d4c..c1538157ce7 100644 --- a/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py +++ b/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py @@ -136,12 +136,11 @@ def test_version_check(self): message = check_version(test_config, test_current_reported_version, test_old_date) assert message is None - # Note: list_versions("quantum") fails during these tests, so latest version number cannot be determined. - # No message is generated if either version number is unavailable. message = check_version(test_config, test_old_reported_version, test_old_date) - assert message is None + assert message is f"\nVersion {test_old_reported_version} of the quantum extension is installed locally, but version {test_current_reported_version} is now available.\nYou can use 'az extension update -n quantum' to upgrade.\n" + # No message is generated if either version number is unavailable. message = check_version(test_config, test_none_version, test_today) assert message is None From cc677aa736490aed91b84ce5ed45e35a032d8cf8 Mon Sep 17 00:00:00 2001 From: Warren Jones Date: Tue, 5 Apr 2022 18:13:09 -0700 Subject: [PATCH 3/3] Update test_version_check again --- .../azext_quantum/tests/latest/test_quantum_workspace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py b/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py index c1538157ce7..7849c1f71ec 100644 --- a/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py +++ b/src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py @@ -138,7 +138,7 @@ def test_version_check(self): assert message is None message = check_version(test_config, test_old_reported_version, test_old_date) - assert message is f"\nVersion {test_old_reported_version} of the quantum extension is installed locally, but version {test_current_reported_version} is now available.\nYou can use 'az extension update -n quantum' to upgrade.\n" + assert message == f"\nVersion {test_old_reported_version} of the quantum extension is installed locally, but version {test_current_reported_version} is now available.\nYou can use 'az extension update -n quantum' to upgrade.\n" # No message is generated if either version number is unavailable. message = check_version(test_config, test_none_version, test_today)