Skip to content

fix: remove dotnet6/7 container build integration tests #9109

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

Open
roger-zhangg wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: remove dotnet6/7 container build integration tests #9109

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
12 changes: 6 additions & 6 deletions tests/integration/buildcmd/test_build_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,10 +1043,10 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
# in process
(
False,
"Dotnet6",
"Dotnet10",
"HelloWorld::HelloWorld.FirstFunction::FunctionHandler",
"HelloWorld::HelloWorld.SecondFunction::FunctionHandler",
"dotnet6",
"dotnet10",
),
(
False,
Expand Down Expand Up @@ -1175,10 +1175,10 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
# in process
(
False,
"Dotnet6",
"Dotnet10",
"HelloWorld::HelloWorld.FirstFunction::FunctionHandler",
"HelloWorld::HelloWorld.SecondFunction::FunctionHandler",
"dotnet6",
"dotnet10",
),
(
False,
Expand Down Expand Up @@ -1367,10 +1367,10 @@ class TestParallelBuilds(DedupBuildIntegBase):
# in process
(
False,
"Dotnet6",
"Dotnet10",
"HelloWorld::HelloWorld.FirstFunction::FunctionHandler",
"HelloWorld::HelloWorld.SecondFunction::FunctionHandler",
"dotnet6",
"dotnet10",
),
(
False,
Expand Down
99 changes: 7 additions & 92 deletions tests/integration/buildcmd/test_build_cmd_dotnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
SKIP_DOCKER_TESTS,
SKIP_DOCKER_BUILD,
SKIP_DOCKER_MESSAGE,
USING_FINCH_RUNTIME,
run_command_with_input,
)
from tests.integration.buildcmd.build_integ_base import (
Expand All @@ -21,67 +20,20 @@

@pytest.mark.dotnet
class TestBuildCommand_Dotnet_cli_package(BuildIntegDotnetBase):
@parameterized.expand(
[
("provided.al2", "Dotnet7", None, None),
("provided.al2", "Dotnet7", None, MountMode.WRITE),
("provided.al2", "Dotnet", None, None),
]
)
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
def test_dotnet_al2(self, runtime, code_uri, mode, mount_mode):
# Skip specific test case when using Finch runtime
if (
runtime == "provided.al2"
and code_uri == "Dotnet7"
and mode is None
and mount_mode is None
and USING_FINCH_RUNTIME
):
self.skipTest(
"Skip test when using Finch runtime: Terraform uses Docker provider that connect to Finch daemon via Docker socket"
)

def test_dotnet_al2(self):
overrides = {
"Runtime": runtime,
"CodeUri": code_uri,
"Runtime": "provided.al2",
"CodeUri": "Dotnet",
"Handler": "HelloWorld::HelloWorld.Function::FunctionHandler",
"Architectures": "x86_64",
}

if mode == "Dotnet":
self.template_path = self.template_path.replace("template.yaml", "template_build_method_dotnet.yaml")
else:
self.template_path = self.template_path.replace("template.yaml", "template_build_method_dotnet_7.yaml")
self.template_path = self.template_path.replace("template.yaml", "template_build_method_dotnet.yaml")

self.validate_build_command(overrides, mode, mount_mode)
self.validate_build_command(overrides, None, None)
self.validate_build_artifacts(self.EXPECTED_FILES_PROJECT_MANIFEST_PROVIDED)
self.validate_invoke_command(overrides, runtime)

@parameterized.expand(
[
("dotnet6", "Dotnet6", None, None),
("dotnet6", "Dotnet6", None, MountMode.WRITE),
("dotnet6", "Dotnet6", "debug", None),
("dotnet6", "Dotnet6", "debug", MountMode.WRITE),
]
)
def test_dotnet_6(self, runtime, code_uri, mode, mount_mode):
if mount_mode and SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD:
self.skipTest(SKIP_DOCKER_MESSAGE)

overrides = {
"Runtime": runtime,
"CodeUri": code_uri,
"Handler": "HelloWorld::HelloWorld.Function::FunctionHandler",
"Architectures": "x86_64",
}

self.validate_build_command(overrides, mode, mount_mode)
self.validate_build_artifacts(self.EXPECTED_FILES_PROJECT_MANIFEST)

if not SKIP_DOCKER_TESTS:
self.validate_invoke_command(overrides, runtime)
self.validate_invoke_command(overrides, "provided.al2")

@parameterized.expand(
[
Expand Down Expand Up @@ -141,43 +93,6 @@ def test_tier1_dotnet_build_in_container(self):
@pytest.mark.dotnet
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
class TestBuildCommand_Dotnet_cli_package_interactive(BuildIntegDotnetBase):
@parameterized.expand(
[
("provided.al2", "Dotnet7", None),
]
)
def test_dotnet_al2_in_container(self, runtime, code_uri, mode):
overrides = {
"Runtime": runtime,
"CodeUri": code_uri,
"Handler": "HelloWorld::HelloWorld.Function::FunctionHandler",
"Architectures": "x86_64",
}

self.template_path = self.template_path.replace("template.yaml", "template_build_method_dotnet_7.yaml")

self.validate_build_command(overrides, mode, use_container=True, input="y")
self.validate_build_artifacts(self.EXPECTED_FILES_PROJECT_MANIFEST_PROVIDED)
self.validate_invoke_command(overrides, runtime)

@parameterized.expand(
[
("dotnet6", "Dotnet6", None),
("dotnet6", "Dotnet6", "debug"),
]
)
def test_dotnet_6_in_container(self, runtime, code_uri, mode):
overrides = {
"Runtime": runtime,
"CodeUri": code_uri,
"Handler": "HelloWorld::HelloWorld.Function::FunctionHandler",
"Architectures": "x86_64",
}

self.validate_build_command(overrides, mode, use_container=True, input="y")
self.validate_build_artifacts(self.EXPECTED_FILES_PROJECT_MANIFEST)
self.validate_invoke_command(overrides, runtime)

@parameterized.expand(
[
("dotnet8", "Dotnet8", None),
Expand All @@ -200,7 +115,7 @@ def test_dotnet_al2023_in_container(self, runtime, code_uri, mode):
self.validate_build_artifacts(self.EXPECTED_FILES_PROJECT_MANIFEST)
self.validate_invoke_command(overrides, runtime)

@parameterized.expand([("dotnet6", "Dotnet6"), ("dotnet8", "Dotnet8")])
@parameterized.expand([("dotnet10", "Dotnet10"), ("dotnet8", "Dotnet8")])
def test_must_fail_in_container_mount_without_write_interactive(self, runtime, code_uri):
use_container = True
overrides = {
Expand Down
Loading