Add integ test

aws · Mar 16, 2021 · 3ac6120 · 3ac6120
1 parent 3992f8e
commit 3ac6120
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 1 deletion.
diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
@@ -1588,6 +1588,13 @@ def test_nested_build(self, use_container, cached, parallel):
             )
 
 
+@parameterized_class(
+    ("template", "use_base_dir"),
+    [
+        (os.path.join("deep-nested", "template.yaml"), False),
+        (os.path.join("base-dir", "template", "template.yaml"), "use_base_dir"),
+    ],
+)
 class TestBuildWithNestedStacks3Level(NestedBuildIntegBase):
     """
     In this template, it has the same structure as .aws-sam/build
@@ -1610,7 +1617,12 @@ def test_nested_build(self):
         if SKIP_DOCKER_TESTS:
             self.skipTest(SKIP_DOCKER_MESSAGE)
 
-        cmdlist = self.get_command_list(use_container=True, cached=True, parallel=True)
+        cmdlist = self.get_command_list(
+            use_container=True,
+            cached=True,
+            parallel=True,
+            base_dir=(os.path.join(self.test_data_path, "base-dir") if self.use_base_dir else None),
+        )
 
         LOG.info("Running Command: %s", cmdlist)
         LOG.info(self.working_dir)

diff --git a/tests/integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/FunctionA/main_a_2.py b/tests/integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/FunctionA/main_a_2.py
@@ -0,0 +1,8 @@
+import json
+
+
+def handler(event, context):
+    """
+    FunctionA in leaf template
+    """
+    return {"statusCode": 200, "body": json.dumps({"hello": "a2"})}
diff --git a/...integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/FunctionA/requirements.txt b/...integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/FunctionA/requirements.txt
diff --git a/...integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/__init__.py b/...integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/__init__.py
diff --git a/...on/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/__init__.py b/...on/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/__init__.py
diff --git a/...stdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/requirements.txt b/...stdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/requirements.txt
diff --git a/...stdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/simple_python.py b/...stdata/buildcmd/base-dir/ChildStackX/ChildStackY/MyLayerVersion/my_layer/simple_python.py
@@ -0,0 +1,2 @@
+def layer_ping():
+    return "This is a Layer Ping from simple_python"
diff --git a/tests/integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/template.yaml b/tests/integration/testdata/buildcmd/base-dir/ChildStackX/ChildStackY/template.yaml
@@ -0,0 +1,21 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A hello world application.
+
+Resources:
+  FunctionA:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main_a_2.handler
+      Runtime: python3.7
+      CodeUri: ChildStackX/ChildStackY/FunctionA
+      Timeout: 600
+
+  MyLayerVersion:
+    Type: AWS::Serverless::LayerVersion
+    Properties:
+      LayerName: MyLayer
+      Description: Layer description
+      ContentUri: ChildStackX/ChildStackY/MyLayerVersion
+      CompatibleRuntimes:
+        - python3.7
diff --git a/tests/integration/testdata/buildcmd/base-dir/ChildStackX/FunctionB/main_b.py b/tests/integration/testdata/buildcmd/base-dir/ChildStackX/FunctionB/main_b.py
@@ -0,0 +1,8 @@
+import json
+
+
+def handler(event, context):
+    """
+    FunctionB in child template
+    """
+    return {"statusCode": 200, "body": json.dumps({"hello": "b"})}
diff --git a/tests/integration/testdata/buildcmd/base-dir/ChildStackX/FunctionB/requirements.txt b/tests/integration/testdata/buildcmd/base-dir/ChildStackX/FunctionB/requirements.txt
diff --git a/tests/integration/testdata/buildcmd/base-dir/ChildStackX/template.yaml b/tests/integration/testdata/buildcmd/base-dir/ChildStackX/template.yaml
@@ -0,0 +1,17 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A hello world application.
+
+Resources:
+  FunctionB:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main_b.handler
+      Runtime: python3.7
+      CodeUri: ChildStackX/FunctionB
+      Timeout: 600
+
+  ChildStackY:
+    Type: AWS::Serverless::Application
+    Properties:
+      Location: ChildStackY/template.yaml
diff --git a/tests/integration/testdata/buildcmd/base-dir/FunctionA/main_a.py b/tests/integration/testdata/buildcmd/base-dir/FunctionA/main_a.py
@@ -0,0 +1,8 @@
+import json
+
+
+def handler(event, context):
+    """
+    FunctionA in root template
+    """
+    return {"statusCode": 200, "body": json.dumps({"hello": "a"})}
diff --git a/tests/integration/testdata/buildcmd/base-dir/FunctionA/requirements.txt b/tests/integration/testdata/buildcmd/base-dir/FunctionA/requirements.txt
diff --git a/tests/integration/testdata/buildcmd/base-dir/template/template.yaml b/tests/integration/testdata/buildcmd/base-dir/template/template.yaml
@@ -0,0 +1,17 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A hello world application.
+
+Resources:
+  FunctionA:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main_a.handler
+      Runtime: python3.7
+      CodeUri: FunctionA
+      Timeout: 600
+
+  ChildStackX:
+    Type: AWS::Serverless::Application
+    Properties:
+      Location: ChildStackX/template.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def layer_ping():
		return "This is a Layer Ping from simple_python"