Merge branch 'main' into feat/gherkinmigration

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

.gitmodules

@@ -1,10 +1,11 @@
 [submodule "schemas"]
 	path = providers/openfeature-provider-flagd/openfeature/schemas
 	url = https://github.com/open-feature/schemas
+	branch = protobuf-v0.6.1
 [submodule "providers/openfeature-provider-flagd/test-harness"]
 	path = providers/openfeature-provider-flagd/openfeature/test-harness
 	url = [email protected]:open-feature/flagd-testbed.git
-	branch = v0.5.18
+	branch = v0.5.20
 [submodule "providers/openfeature-provider-flagd/spec"]
 	path = providers/openfeature-provider-flagd/openfeature/spec
 	url = https://github.com/open-feature/spec

providers/openfeature-provider-flagd/openfeature/schemas

@@ -5,7 +5,6 @@
 from tests.e2e.step.event_steps import *  # noqa: F403
 from tests.e2e.step.flag_step import *  # noqa: F403
 from tests.e2e.step.provider_steps import *  # noqa: F403
-from tests.e2e.steps import *  # noqa: F403  # noqa: F403
 
 JsonPrimitive = typing.Union[str, bool, float, int]
 

providers/openfeature-provider-flagd/openfeature/test-harness

@@ -0,0 +1,34 @@
+import pytest
+
+from openfeature.contrib.provider.flagd.config import ResolverType
+from tests.e2e.testFilter import TestFilter
+
+# from tests.e2e.step.config_steps import *
+# from tests.e2e.step.event_steps import *
+# from tests.e2e.step.provider_steps import *
+
+resolver = ResolverType.IN_PROCESS
+feature_list = {
+    "~targetURI",
+    "~customCert",
+    "~unixsocket",
+    "~events",
+    "~sync",
+    "~caching",
+    "~reconnect",
+    "~grace",
+    "~connect",
+    "~targeting",
+}
+
+
+def pytest_collection_modifyitems(config, items):
+    test_filter = TestFilter(
+        config, feature_list=feature_list, resolver=resolver.value, base_path=__file__
+    )
+    test_filter.filter_items(items)
+
+
+@pytest.fixture()
+def resolver_type() -> ResolverType:
+    return resolver

providers/openfeature-provider-flagd/tests/e2e/in_process_file/__init__.py renamed to providers/openfeature-provider-flagd/tests/e2e/__init__.py

@@ -0,0 +1,5 @@
+# as soon as we support all the features, we can actually remove this limitation to not run on Python 3.8
+# Python 3.8 does not fully support tagging, hence that it will run all cases
+# if sys.version_info >= (3, 9):
+#     scenarios(f"{TEST_HARNESS_PATH}/gherkin")
+