use unittest subTest to fix noise in test results ("The type of the None singleton"); fix whitespaces in test/round_trip/hcl2_reconstructed/smoke.tf

Author: kkozik-amplify

test/round_trip/hcl2_reconstructed/smoke.tf

@@ -32,7 +32,7 @@ block label1 label2 {
   k = a.b.5
   l = a.*.b
   m = a[*][c].a.*.1
-
+  
   block b1 {
     a = 1
   }
@@ -52,12 +52,12 @@ block label1 label3 {
 
 block {
   route53_forwarding_rule_shares = {
-    for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) :
+    for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) : 
     "${forwarding_rule_key}" => {
       aws_account_ids  = [
-        for account_name in var.route53_resolver_forwarding_rule_shares[forwarding_rule_key].aws_account_names :
+        for account_name in var.route53_resolver_forwarding_rule_shares[forwarding_rule_key].aws_account_names : 
         module.remote_state_subaccounts.map[account_name].outputs["aws_account_id"]
-
+        
       ]
     } ... if substr(bucket_name, 0, 1) == "l"
   }

test/round_trip/test_round_trip.py

@@ -26,20 +26,20 @@
 ROUND_TRIP_DIR = Path(__file__).absolute().parent
 HCL2_ORIGINAL_DIR = ROUND_TRIP_DIR / "hcl2_original"
 
+SPECIAL_DIR = ROUND_TRIP_DIR / "special"
+
 _STEP_DIRS = {
     "hcl2_original": HCL2_ORIGINAL_DIR,
     "hcl2_reconstructed": ROUND_TRIP_DIR / "hcl2_reconstructed",
     "json_serialized": ROUND_TRIP_DIR / "json_serialized",
     "json_reserialized": ROUND_TRIP_DIR / "json_reserialized",
-    "json_operator_precedence": ROUND_TRIP_DIR / "json_operator_precedence",
 }
 
 _STEP_SUFFIXES = {
     "hcl2_original": ".tf",
     "hcl2_reconstructed": ".tf",
     "json_serialized": ".json",
     "json_reserialized": ".json",
-    "json_operator_precedence": ".json",
 }
 
 
@@ -48,7 +48,6 @@ class SuiteStep(Enum):
     RECONSTRUCTED = "hcl2_reconstructed"
     JSON_SERIALIZED = "json_serialized"
     JSON_RESERIALIZED = "json_reserialized"
-    JSON_OPERATOR_PRECEDENCE = "json_operator_precedence"
 
 
 def _get_suites() -> List[str]:
@@ -109,20 +108,18 @@ class TestRoundTripSerialization(TestCase):
 
     def test_hcl_to_json(self):
         for suite in _get_suites():
-            yield self.check_hcl_to_json, suite
-
-    def check_hcl_to_json(self, suite: str):
-        hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
-        json_path = _get_suite_file(suite, SuiteStep.JSON_SERIALIZED)
+            with self.subTest(suite=suite):
+                hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
+                json_path = _get_suite_file(suite, SuiteStep.JSON_SERIALIZED)
 
-        actual = _parse_and_serialize(hcl_path.read_text())
-        expected = json.loads(json_path.read_text())
+                actual = _parse_and_serialize(hcl_path.read_text())
+                expected = json.loads(json_path.read_text())
 
-        self.assertEqual(
-            actual,
-            expected,
-            f"HCL → JSON serialization mismatch for {suite}",
-        )
+                self.assertEqual(
+                    actual,
+                    expected,
+                    f"HCL → JSON serialization mismatch for {suite}",
+                )
 
 
 class TestRoundTripReserialization(TestCase):
@@ -132,21 +129,19 @@ class TestRoundTripReserialization(TestCase):
 
     def test_json_reserialization(self):
         for suite in _get_suites():
-            yield self.check_json_reserialization, suite
+            with self.subTest(suite=suite):
+                hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
+                json_reserialized_path = _get_suite_file(suite, SuiteStep.JSON_RESERIALIZED)
 
-    def check_json_reserialization(self, suite: str):
-        hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
-        json_reserialized_path = _get_suite_file(suite, SuiteStep.JSON_RESERIALIZED)
+                serialized = _parse_and_serialize(hcl_path.read_text())
+                actual = _deserialize_and_reserialize(serialized)
 
-        serialized = _parse_and_serialize(hcl_path.read_text())
-        actual = _deserialize_and_reserialize(serialized)
-
-        expected = json.loads(json_reserialized_path.read_text())
-        self.assertEqual(
-            actual,
-            expected,
-            f"JSON reserialization mismatch for {suite}",
-        )
+                expected = json.loads(json_reserialized_path.read_text())
+                self.assertEqual(
+                    actual,
+                    expected,
+                    f"JSON reserialization mismatch for {suite}",
+                )
 
 
 class TestRoundTripReconstruction(TestCase):
@@ -156,21 +151,19 @@ class TestRoundTripReconstruction(TestCase):
 
     def test_json_to_hcl(self):
         for suite in _get_suites():
-            yield self.check_json_to_hcl, suite
-
-    def check_json_to_hcl(self, suite: str):
-        hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
-        hcl_reconstructed_path = _get_suite_file(suite, SuiteStep.RECONSTRUCTED)
+            with self.subTest(suite=suite):
+                hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
+                hcl_reconstructed_path = _get_suite_file(suite, SuiteStep.RECONSTRUCTED)
 
-        serialized = _parse_and_serialize(hcl_path.read_text())
-        actual = _deserialize_and_reconstruct(serialized)
+                serialized = _parse_and_serialize(hcl_path.read_text())
+                actual = _deserialize_and_reconstruct(serialized)
 
-        expected = hcl_reconstructed_path.read_text()
-        self.assertMultiLineEqual(
-            actual,
-            expected,
-            f"HCL reconstruction mismatch for {suite}",
-        )
+                expected = hcl_reconstructed_path.read_text()
+                self.assertMultiLineEqual(
+                    actual,
+                    expected,
+                    f"HCL reconstruction mismatch for {suite}",
+                )
 
 
 class TestRoundTripFull(TestCase):
@@ -180,27 +173,25 @@ class TestRoundTripFull(TestCase):
 
     def test_full_round_trip(self):
         for suite in _get_suites():
-            yield self.check_full_round_trip, suite
-
-    def check_full_round_trip(self, suite: str):
-        hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
-        original_hcl = hcl_path.read_text()
+            with self.subTest(suite=suite):
+                hcl_path = _get_suite_file(suite, SuiteStep.ORIGINAL)
+                original_hcl = hcl_path.read_text()
 
-        # Forward: HCL → JSON
-        serialized = _parse_and_serialize(original_hcl)
+                # Forward: HCL → JSON
+                serialized = _parse_and_serialize(original_hcl)
 
-        # Reconstruct: JSON → HCL
-        reconstructed_hcl = _deserialize_and_reconstruct(serialized)
+                # Reconstruct: JSON → HCL
+                reconstructed_hcl = _deserialize_and_reconstruct(serialized)
 
-        # Re-parse: reconstructed HCL → JSON
-        reserialized = _parse_and_serialize(reconstructed_hcl)
+                # Reparse: reconstructed HCL → JSON
+                reserialized = _parse_and_serialize(reconstructed_hcl)
 
-        self.assertEqual(
-            reserialized,
-            serialized,
-            f"Full round-trip mismatch for {suite}: "
-            f"HCL → JSON → HCL → JSON did not produce identical JSON",
-        )
+                self.assertEqual(
+                    reserialized,
+                    serialized,
+                    f"Full round-trip mismatch for {suite}: "
+                    f"HCL → JSON → HCL → JSON did not produce identical JSON",
+                )
 
 
 class TestOperatorPrecedence(TestCase):