Skip to content

{containerapp} Re-record failing source-to-cloud patch tests #6984

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
yanzhudd merged 1 commit into from
Nov 14, 2023
Merged

{containerapp} Re-record failing source-to-cloud patch tests #6984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11,265 changes: 2,927 additions & 8,338 deletions .../tests/latest/recordings/test_containerapp_patch_list_and_apply_with_environment_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,724 changes: 1,971 additions & 1,753 deletions ...erapp/tests/latest/recordings/test_containerapp_patch_list_and_apply_with_node18_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4,043 changes: 1,746 additions & 2,297 deletions ...pp/tests/latest/recordings/test_containerapp_patch_list_and_apply_with_python310_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

5,068 changes: 2,916 additions & 2,152 deletions ...sts/latest/recordings/test_containerapp_patch_list_and_apply_with_resource_group_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

11,801 changes: 1,201 additions & 10,600 deletions ...app/tests/latest/recordings/test_containerapp_patch_list_and_apply_with_show_all_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

7,372 changes: 2,565 additions & 4,807 deletions ...tests/latest/recordings/test_containerapp_patch_list_and_apply_without_arguments_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/containerapp/azext_containerapp/tests/latest/test_containerapp_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_containerapp_patch_list_and_apply_with_resource_group_e2e(self, resourc
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patchable_images = self.cmd(f'containerapp patch list -g {resource_group}').get_output_in_json()
Expand Down Expand Up @@ -86,7 +86,7 @@ def test_containerapp_patch_list_and_apply_with_environment_e2e(self, resource_g
self.cmd(f'containerapp env create -g {resource_group} -n {env_name}')

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patchable_images = self.cmd(f'containerapp patch list -g {resource_group} --environment {env_name}').get_output_in_json()
Expand Down Expand Up @@ -114,7 +114,7 @@ def test_containerapp_patch_list_and_apply_with_show_all_e2e(self, resource_grou
env_name = self.create_random_name(prefix='env', length=24)
self.cmd(f'containerapp env create -g {resource_group} -n {env_name}')

create_and_verify_containerapp_up(self, resource_group, env_name=env_name, image=image, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, image=image, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patch_cmd = f'containerapp patch list -g {resource_group} --environment {env_name} --show-all'
Expand Down Expand Up @@ -152,7 +152,7 @@ def test_containerapp_patch_list_and_apply_without_arguments_e2e(self, resource_
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down Expand Up @@ -192,7 +192,7 @@ def test_containerapp_patch_list_and_apply_with_node18_e2e(self, resource_group)
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a Node 18 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down Expand Up @@ -233,7 +233,7 @@ def test_containerapp_patch_list_and_apply_with_python310_e2e(self, resource_gro
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a Python 3.10 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down
3 changes: 0 additions & 3 deletions src/containerapp/azext_containerapp/tests/latest/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ def create_and_verify_containerapp_up(
target_port = None,
app_name = None,
requires_acr_prerequisite = False):
# Configure the default location
test_cls.cmd('configure --defaults location={}'.format(TEST_LOCATION))

# Ensure that the Container App environment is created
if env_name is None:
env_name = test_cls.create_random_name(prefix='env', length=24)
Expand Down