Skip to content

{AKS} az aks install-cli: Fix install-cli related test cases #26072

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
zhoxing-ms merged 5 commits into from
Apr 10, 2023
Merged

{AKS} az aks install-cli: Fix install-cli related test cases #26072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06836a8
fix test
FumingZhang Apr 7, 2023
2b0ce53
fix 2
FumingZhang Apr 7, 2023
390884c
fix 3
FumingZhang Apr 7, 2023
23185e7
fix 4
FumingZhang Apr 7, 2023
1b9d1d3
Trigger Build
FumingZhang Apr 10, 2023
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
10 changes: 5 additions & 5 deletions src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,10 @@ def test_k8s_install_kubelogin_emit_warnings(self, logger_mock, mock_url_retriev
try:
temp_dir = os.path.realpath(tempfile.mkdtemp()) # tempfile.TemporaryDirectory() is no available on 2.7
test_location = os.path.join(temp_dir, 'kubelogin')
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location)
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location, arch="amd64")
self.assertEqual(mock_url_retrieve.call_count, 1)
# 3 warnings, 1st for arch, 2nd for download result, 3rd for updating PATH
self.assertEqual(logger_mock.warning.call_count, 3) # 3 warnings, one for download result
# 2 warnings, 1st for download result, 2nd for updating PATH
self.assertEqual(logger_mock.warning.call_count, 2) # 3 warnings, one for download result
finally:
shutil.rmtree(temp_dir)

Expand All @@ -659,7 +659,7 @@ def test_k8s_install_kubelogin_create_installation_dir(self, logger_mock, mock_u
try:
temp_dir = tempfile.mkdtemp() # tempfile.TemporaryDirectory() is no available on 2.7
test_location = os.path.join(temp_dir, 'foo', 'kubelogin')
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location)
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location, arch="amd64")
self.assertTrue(os.path.exists(test_location))
finally:
shutil.rmtree(temp_dir)
Expand Down Expand Up @@ -688,7 +688,7 @@ def test_k8s_install_kubelogin_with_custom_source_url(self, logger_mock, mock_ur
test_location = os.path.join(temp_dir, 'foo', 'kubelogin')
test_ver = '1.2.6'
test_source_url = 'http://url2'
k8s_install_kubelogin(mock.MagicMock(), client_version=test_ver, install_location=test_location, source_url=test_source_url)
k8s_install_kubelogin(mock.MagicMock(), client_version=test_ver, install_location=test_location, source_url=test_source_url, arch="amd64")
mock_url_retrieve.assert_called_with(mockUrlretrieveUrlValidator(test_source_url, test_ver), mock.ANY)
finally:
shutil.rmtree(temp_dir)
Expand Down
10 changes: 5 additions & 5 deletions src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,10 @@ def test_k8s_install_kubelogin_emit_warnings(self, logger_mock, mock_url_retriev
try:
temp_dir = os.path.realpath(tempfile.mkdtemp()) # tempfile.TemporaryDirectory() is no available on 2.7
test_location = os.path.join(temp_dir, 'kubelogin')
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location)
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location, arch="amd64")
self.assertEqual(mock_url_retrieve.call_count, 1)
# 3 warnings, 1st for arch, 2nd for download result, 3rd for updating PATH
self.assertEqual(logger_mock.warning.call_count, 3) # 3 warnings, one for download result
# 2 warnings, 1st for download result, 2nd for updating PATH
self.assertEqual(logger_mock.warning.call_count, 2) # 2 warnings, one for download result
finally:
shutil.rmtree(temp_dir)

Expand All @@ -643,7 +643,7 @@ def test_k8s_install_kubelogin_create_installation_dir(self, logger_mock, mock_u
try:
temp_dir = tempfile.mkdtemp() # tempfile.TemporaryDirectory() is no available on 2.7
test_location = os.path.join(temp_dir, 'foo', 'kubelogin')
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location)
k8s_install_kubelogin(mock.MagicMock(), client_version='0.0.4', install_location=test_location, arch="amd64")
self.assertTrue(os.path.exists(test_location))
finally:
shutil.rmtree(temp_dir)
Expand Down Expand Up @@ -672,7 +672,7 @@ def test_k8s_install_kubelogin_with_custom_source_url(self, logger_mock, mock_ur
test_location = os.path.join(temp_dir, 'foo', 'kubelogin')
test_ver = '1.2.6'
test_source_url = 'http://url2'
k8s_install_kubelogin(mock.MagicMock(), client_version=test_ver, install_location=test_location, source_url=test_source_url)
k8s_install_kubelogin(mock.MagicMock(), client_version=test_ver, install_location=test_location, source_url=test_source_url, arch="amd64")
mock_url_retrieve.assert_called_with(MockUrlretrieveUrlValidator(test_source_url, test_ver), mock.ANY)
finally:
shutil.rmtree(temp_dir)
Expand Down