diff --git a/server/tests-py/conftest.py b/server/tests-py/conftest.py index bd30baf72c9..7b131a48722 100644 --- a/server/tests-py/conftest.py +++ b/server/tests-py/conftest.py @@ -428,19 +428,15 @@ def evts_webhook(hge_fixture_env: dict[str, str]): @pytest.fixture(scope='class') @pytest.mark.early -def actions_fixture(pg_version: int, hge_url: str, hge_key: Optional[str], hge_fixture_env: dict[str, str]): - if pg_version < 10: - pytest.skip('Actions are not supported on Postgres version < 10') - - # Start actions' webhook server - webhook_httpd = ActionsWebhookServer(hge_url, hge_key, server_address=('localhost', 5593)) - web_server = threading.Thread(target=webhook_httpd.serve_forever) - web_server.start() - hge_fixture_env['ACTION_WEBHOOK_HANDLER'] = webhook_httpd.url - yield webhook_httpd - webhook_httpd.shutdown() - webhook_httpd.server_close() - web_server.join() +def actions_fixture(hge_url: str, hge_key: Optional[str], hge_fixture_env: dict[str, str]): + server = ActionsWebhookServer(hge_url, hge_key, server_address=('localhost', 5593)) + thread = threading.Thread(target=server.serve_forever) + thread.start() + hge_fixture_env['ACTION_WEBHOOK_HANDLER'] = server.url + yield server + server.shutdown() + server.server_close() + thread.join() use_action_fixtures = pytest.mark.usefixtures( 'actions_fixture', diff --git a/server/tests-py/test_graphql_mutations.py b/server/tests-py/test_graphql_mutations.py index 9bf24dacdeb..e8ffa7bd37e 100644 --- a/server/tests-py/test_graphql_mutations.py +++ b/server/tests-py/test_graphql_mutations.py @@ -59,10 +59,7 @@ class TestGraphQLInsert: class TestGraphQLInsertIdentityColumn: @pytest.fixture(autouse=True) - def transact(self, pg_version, hge_ctx): - if pg_version < 10: - pytest.skip("Identity columns are not supported in Postgres version < 10") - + def transact(self, hge_ctx): setup_q = { 'type': 'bulk', 'args': [