Skip to content

Commit ba4a6fc

Browse files
fix flaky reqs parse tool test (Azure#39027)
1 parent 76c5b00 commit ba4a6fc

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

tools/azure-sdk-tools/tests/test_requirements_parse.py

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from typing import List
44
from ci_tools.scenario.generation import replace_dev_reqs
5+
from ci_tools.parsing import ParsedSetup
56

67
integration_folder = os.path.join(os.path.dirname(__file__), "integration")
78
sample_dev_reqs_folder = os.path.join(integration_folder, "scenarios", "dev_requirement_samples")
@@ -60,17 +61,24 @@ def test_replace_dev_reqs_relative(tmp_directory_create):
6061
requirements_file = create_temporary_scenario(tmp_directory_create, target_file)
6162
expected_output_folder = os.path.join(repo_root, "sdk", "core", "azure-core", ".tmp_whl_dir")
6263

64+
# Get the current relative versions of the packages to properly construct the expected results
65+
coretestserver_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "core", "azure-core", "tests", "testserver_tests", "coretestserver")).version
66+
identity_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "identity", "azure-identity")).version
67+
mgmt_core_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "core", "azure-mgmt-core")).version
68+
sdk_tools_version = ParsedSetup.from_path(os.path.join(repo_root, "tools", "azure-sdk-tools")).version
69+
core_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "core", "azure-core")).version
70+
6371
expected_results = [
64-
os.path.join(expected_output_folder, "coretestserver-1.0.0b1-py3-none-any.whl"),
65-
os.path.join(expected_output_folder, "coretestserver-1.0.0b1-py3-none-any.whl"),
66-
os.path.join(expected_output_folder, "azure_identity-1.19.1-py3-none-any.whl"),
67-
os.path.join(expected_output_folder, "azure_identity-1.19.1-py3-none-any.whl"),
68-
os.path.join(expected_output_folder, "azure_mgmt_core-1.5.0-py3-none-any.whl"),
69-
os.path.join(expected_output_folder, "azure_mgmt_core-1.5.0-py3-none-any.whl"),
70-
os.path.join(expected_output_folder, "azure_sdk_tools-0.0.0-py3-none-any.whl[build]"),
71-
os.path.join(expected_output_folder, "azure_sdk_tools-0.0.0-py3-none-any.whl[build]"),
72-
os.path.join(expected_output_folder, "azure_core-1.32.1-py3-none-any.whl"),
73-
os.path.join(expected_output_folder, "azure_core-1.32.1-py3-none-any.whl"),
72+
os.path.join(expected_output_folder, f"coretestserver-{coretestserver_version}-py3-none-any.whl"),
73+
os.path.join(expected_output_folder, f"coretestserver-{coretestserver_version}-py3-none-any.whl"),
74+
os.path.join(expected_output_folder, f"azure_identity-{identity_version}-py3-none-any.whl"),
75+
os.path.join(expected_output_folder, f"azure_identity-{identity_version}-py3-none-any.whl"),
76+
os.path.join(expected_output_folder, f"azure_mgmt_core-{mgmt_core_version}-py3-none-any.whl"),
77+
os.path.join(expected_output_folder, f"azure_mgmt_core-{mgmt_core_version}-py3-none-any.whl"),
78+
os.path.join(expected_output_folder, f"azure_sdk_tools-{sdk_tools_version}-py3-none-any.whl[build]"),
79+
os.path.join(expected_output_folder, f"azure_sdk_tools-{sdk_tools_version}-py3-none-any.whl[build]"),
80+
os.path.join(expected_output_folder, f"azure_core-{core_version}-py3-none-any.whl"),
81+
os.path.join(expected_output_folder, f"azure_core-{core_version}-py3-none-any.whl"),
7482
]
7583

7684
requirements_before = get_requirements_from_file(requirements_file)

0 commit comments

Comments
 (0)