From 662c7bb492548ef32c64e0c2234be3fc2c4903ed Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Mon, 6 Nov 2023 17:20:52 +0100 Subject: [PATCH] Run planetscale adapters for all tests that don't exclude vitess --- .../query-tests-setup/src/connector_tag/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs index d92bb5e96314..c9edb89d060c 100644 --- a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs +++ b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs @@ -302,7 +302,9 @@ pub(crate) fn should_run( .any(|only| ConnectorVersion::try_from(*only).unwrap().matches_pattern(&version)); } - if CONFIG.external_test_executor().is_some() && exclude.iter().any(|excl| excl.0.to_uppercase() == "JS") { + let running_driver_adapters = CONFIG.external_test_executor().is_some(); + + if running_driver_adapters && exclude.iter().any(|excl| excl.0.to_uppercase() == "JS") { println!("Excluded test execution for JS driver adapters. Skipping test"); return false; }; @@ -316,7 +318,7 @@ pub(crate) fn should_run( // FIXME: This skips vitess unless explicitly opted in. Replace with `true` when fixing // https://github.com/prisma/client-planning/issues/332 - !matches!(version, ConnectorVersion::Vitess(_)) + running_driver_adapters || !matches!(version, ConnectorVersion::Vitess(_)) } impl TryFrom<(&str, Option<&str>)> for ConnectorVersion {