Skip to content

test: fix integration test cases #3568

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
mndeveci merged 13 commits into from
Jan 6, 2022
Merged

test: fix integration test cases #3568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
22e20db
fix flaky warm containers testing
moelasmar Jan 5, 2022
32d3a5f
use py3.7 instead of 3.8, as it is not available in testing windows host
moelasmar Jan 5, 2022
93f55e5
selectors are not working in windows
moelasmar Jan 5, 2022
1244fa6
ruby 2.5 is not supported, use 2.7 instead
moelasmar Jan 5, 2022
faa6123
fix the logic to wait till apis are running in windows
moelasmar Jan 5, 2022
ffba9b7
add auto generated S3 Prefix
moelasmar Jan 5, 2022
41fa022
fix ruby version
moelasmar Jan 5, 2022
a056e52
move s3 prefix creation to Setup method
moelasmar Jan 5, 2022
a338eb1
fix the sync integration testing
moelasmar Jan 5, 2022
c6b482f
Merge branch 'develop' into develop-fix-canaries
moelasmar Jan 6, 2022
c2d9567
remove appveyor sync
moelasmar Jan 6, 2022
8991df8
Merge branch 'develop' into develop-fix-canaries
mndeveci Jan 6, 2022
4ceb42b
Merge remote-tracking branch 'moelasamar-sam-cli-public/develop-fix-c…
moelasmar Jan 6, 2022
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
2 changes: 1 addition & 1 deletion appveyor-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ install:
- sh: "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64"
- sh: "PATH=$JAVA_HOME/bin:$PATH"
- sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
- sh: "rvm use 2.5"
Copy link
Contributor

@mndeveci mndeveci Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove support for building ruby2.7 functions as well. (not in this one but in follow-up PR)

- sh: "rvm use 2.7.2"
- sh: "docker --version"

# Install latest gradle
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ for:
- sh: "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64"
- sh: "PATH=$JAVA_HOME/bin:$PATH"
- sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
- sh: "rvm use 2.5"
- sh: "rvm use 2.7.2"
- sh: "docker --version"

# Install latest gradle
Expand Down
22 changes: 11 additions & 11 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 @@ -395,13 +395,13 @@ def test_building_default_package_json(self, runtime, use_container, architectur
"Skip build tests on windows when running in CI unless overridden",
)
class TestBuildCommand_RubyFunctions(BuildIntegRubyBase):
@parameterized.expand(["ruby2.5", "ruby2.7"])
@parameterized.expand(["ruby2.7"])
@pytest.mark.flaky(reruns=3)
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
def test_building_ruby_in_container(self, runtime):
self._test_with_default_gemfile(runtime, "use_container", "Ruby", self.test_data_path)

@parameterized.expand(["ruby2.5", "ruby2.7"])
@parameterized.expand(["ruby2.7"])
@pytest.mark.flaky(reruns=3)
def test_building_ruby_in_process(self, runtime):
self._test_with_default_gemfile(runtime, False, "Ruby", self.test_data_path)
Expand All @@ -414,13 +414,13 @@ def test_building_ruby_in_process(self, runtime):
class TestBuildCommand_RubyFunctions_With_Architecture(BuildIntegRubyBase):
template = "template_with_architecture.yaml"

@parameterized.expand(["ruby2.5", "ruby2.7", ("ruby2.7", "arm64")])
@parameterized.expand(["ruby2.7", ("ruby2.7", "arm64")])
@pytest.mark.flaky(reruns=3)
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
def test_building_ruby_in_container_with_specified_architecture(self, runtime, architecture="x86_64"):
self._test_with_default_gemfile(runtime, "use_container", "Ruby", self.test_data_path, architecture)

@parameterized.expand(["ruby2.5", "ruby2.7", ("ruby2.7", "arm64")])
@parameterized.expand(["ruby2.7", ("ruby2.7", "arm64")])
@pytest.mark.flaky(reruns=3)
def test_building_ruby_in_process_with_specified_architecture(self, runtime, architecture="x86_64"):
self._test_with_default_gemfile(runtime, False, "Ruby", self.test_data_path, architecture)
Expand All @@ -436,7 +436,7 @@ class TestBuildCommand_RubyFunctionsWithGemfileInTheRoot(BuildIntegRubyBase):
This doesn't apply to containerized build, since it copies only the function folder to the container
"""

@parameterized.expand([("ruby2.5"), ("ruby2.7")])
@parameterized.expand([("ruby2.7")])
@pytest.mark.flaky(reruns=3)
def test_building_ruby_in_process_with_root_gemfile(self, runtime):
self._prepare_application_environment()
Expand Down Expand Up @@ -1347,12 +1347,12 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
(False, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
# container
(True, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
]
)
@pytest.mark.flaky(reruns=3)
Expand Down Expand Up @@ -1470,12 +1470,12 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
(False, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
# container
(True, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
]
)
@pytest.mark.flaky(reruns=3)
Expand Down Expand Up @@ -1601,12 +1601,12 @@ class TestParallelBuilds(DedupBuildIntegBase):
(False, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
# container
(True, "Java/gradlew", "aws.example.Hello::myHandler", "aws.example.SecondFunction::myHandler", "java8"),
(True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs14.x"),
(True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.5"),
(True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby2.7"),
]
)
@pytest.mark.flaky(reruns=3)
Expand Down
8 changes: 7 additions & 1 deletion tests/integration/delete/test_delete_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ def test_delete_no_prompts_no_s3_prefix_zip(self, template_file):
stack_name=stack_name,
capabilities="CAPABILITY_IAM",
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down Expand Up @@ -271,6 +272,7 @@ def test_delete_no_prompts_no_s3_prefix_image(self, template_file):
capabilities="CAPABILITY_IAM",
image_repository=self.ecr_repo_name,
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down Expand Up @@ -310,7 +312,7 @@ def test_delete_nested_stacks(self, template_file):
# Note(xinhol): --capabilities does not allow passing multiple, we need to fix it
# here we use samconfig-deep-nested.toml as a workaround
config_file=self.test_data_path.joinpath("samconfig-deep-nested.toml"),
s3_prefix="integ_deploy",
s3_prefix=self.s3_prefix,
s3_bucket=self.s3_bucket.name,
force_upload=True,
notification_arns=self.sns_arn,
Expand Down Expand Up @@ -404,6 +406,7 @@ def test_delete_guided_no_stack_name_no_region(self, template_file):
stack_name=stack_name,
capabilities="CAPABILITY_IAM",
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down Expand Up @@ -440,6 +443,7 @@ def test_delete_guided_ecr_repository_present(self, template_file):
stack_name=stack_name,
capabilities="CAPABILITY_IAM",
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down Expand Up @@ -479,6 +483,7 @@ def test_delete_guided_no_s3_prefix_image(self, template_file):
capabilities="CAPABILITY_IAM",
image_repository=self.ecr_repo_name,
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down Expand Up @@ -517,6 +522,7 @@ def test_delete_guided_retain_s3_artifact(self, template_file):
stack_name=stack_name,
capabilities="CAPABILITY_IAM",
s3_bucket=self.bucket_name,
s3_prefix=self.s3_prefix,
force_upload=True,
notification_arns=self.sns_arn,
parameter_overrides="Parameter=Clarity",
Expand Down
Loading