Added test for default architecture setting

zappa · Dec 21, 2022 · 7b2e0d7 · 7b2e0d7
1 parent 6c0e270
commit 7b2e0d7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 138 deletions.
diff --git a/test_settings.json b/test_settings.json
@@ -20,7 +20,6 @@
            "CognitoIdentityId": "identity.cognitoIdentityId",
            "APIStage": "stage"
        },
-       "architecture": "arm64",
        "events": [
            {
                "function": "tests.test_app.schedule_me",
@@ -128,5 +127,19 @@
        "delete_local_zip": true,
        "binary_support": true,
        "additional_text_mimetypes": ["application/custommimetype"]
-    }
+    },
+    "arch_arm64": {
+        "s3_bucket": "lmbda",
+        "app_function": "tests.test_app.hello_world",
+        "delete_local_zip": true,
+        "debug": true,
+        "architecture": "arm64"
+     },
+     "archfail": {
+        "s3_bucket": "lmbda",
+        "app_function": "tests.test_app.hello_world",
+        "delete_local_zip": true,
+        "debug": true,
+        "architecture": "invalid_architecture"
+     }
 }
diff --git a/tests/test_bad_architecture_settings.json b/tests/test_bad_architecture_settings.json
diff --git a/tests/tests.py b/tests/tests.py
@@ -1106,13 +1106,18 @@ def test_load_settings(self):
         self.assertEqual(False, zappa_cli.stage_config["touch"])
 
     def test_load_extended_settings(self):
-
         zappa_cli = ZappaCLI()
         zappa_cli.api_stage = "extendo"
         zappa_cli.load_settings("test_settings.json")
         self.assertEqual("lmbda", zappa_cli.stage_config["s3_bucket"])
         self.assertEqual(True, zappa_cli.stage_config["touch"])
-        self.assertEqual('arm64', zappa_cli.stage_config['architecture'])
+        self.assertIn('x86_64', zappa_cli.architecture)
+
+        zappa_cli = ZappaCLI()
+        zappa_cli.api_stage = "arch_arm64"
+        zappa_cli.load_settings("test_settings.json")
+        self.assertIn('arm64', zappa_cli.stage_config["architecture"])
+        self.assertIn('arm64', zappa_cli.architecture)
 
         zappa_cli = ZappaCLI()
         zappa_cli.api_stage = "extendofail"
@@ -1132,9 +1137,9 @@ def test_load_extended_settings(self):
         self.assertTrue(zappa_cli.stage_config["delete_local_zip"])  # The base
 
         zappa_cli = ZappaCLI()
-        zappa_cli.api_stage = "ttt888"
+        zappa_cli.api_stage = "archfail"
         with self.assertRaises(ValueError):
-            zappa_cli.load_settings("tests/test_bad_architecture_settings.json")
+            zappa_cli.load_settings("test_settings.json")
 
     def test_load_settings__lambda_concurrency_enabled(self):
         zappa_cli = ZappaCLI()