Fix regression with ALLOW_EXTRA and Any validator (alecthomas#522)

voluptuous/__init__.py

@@ -73,6 +73,7 @@
     ...                  'Users': {'snmp_community': 'monkey'}}}}
     True
 """
+
 # flake8: noqa
 # fmt: off
 from voluptuous.schema_builder import *

voluptuous/schema_builder.py

@@ -1,4 +1,3 @@
-
 # fmt: off
 from __future__ import annotations
 
@@ -363,10 +362,10 @@ def validate_mapping(path, iterable, out):
                     if remove_key:
                         # remove key
                         continue
-                    elif error:
-                        errors.append(error)
                     elif self.extra == ALLOW_EXTRA:
                         out[key] = value
+                    elif error:
+                        errors.append(error)
                     elif self.extra != REMOVE_EXTRA:
                         errors.append(er.Invalid('extra keys not allowed', key_path))
                         # else REMOVE_EXTRA: ignore the key so it's removed from output

voluptuous/tests/tests.py

@@ -1704,6 +1704,23 @@ def as_int(a):
     assert str(ctx.value.errors[1]) == "expecting a number @ data['four']"
 
 
+def test_key3():
+    schema = Schema(
+        {
+            Any("name", "area"): str,
+            "domain": str,
+        },
+        extra=ALLOW_EXTRA,
+    )
+    schema(
+        {
+            "name": "one",
+            "domain": "two",
+            "additional_key": "extra",
+        }
+    )
+
+
 def test_coerce_enum():
     """Test Coerce Enum"""