From afce5fa61b3561ffba28ad5a69fcd5b76398777d Mon Sep 17 00:00:00 2001 From: Teddy Date: Tue, 25 Apr 2023 16:05:49 +0200 Subject: [PATCH] Fix E2E tests (#11267) * fix: profile only include schema * tests: add logic to handle exsiting views and table for Hive * fix: python linting --- ingestion/tests/cli_e2e/base/config_builders/builders.py | 6 +++--- ingestion/tests/cli_e2e/base/test_cli_db.py | 5 ++++- ingestion/tests/cli_e2e/test_cli_hive.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ingestion/tests/cli_e2e/base/config_builders/builders.py b/ingestion/tests/cli_e2e/base/config_builders/builders.py index 7993e133214..1da3ce0fefc 100644 --- a/ingestion/tests/cli_e2e/base/config_builders/builders.py +++ b/ingestion/tests/cli_e2e/base/config_builders/builders.py @@ -62,9 +62,9 @@ class ProfilerConfigBuilder(BaseBuilder): } if self.config_args.get("includes"): - self.config["source"]["sourceConfig"]["config"][ - "schemaFilterPattern" - ] = self.config_args + self.config["source"]["sourceConfig"]["config"]["schemaFilterPattern"] = { + "includes": self.config_args.get("includes") + } self.config["processor"] = {"type": "orm-profiler", "config": {}} return self.config diff --git a/ingestion/tests/cli_e2e/base/test_cli_db.py b/ingestion/tests/cli_e2e/base/test_cli_db.py index 6c57d211b1d..8a2e35c706a 100644 --- a/ingestion/tests/cli_e2e/base/test_cli_db.py +++ b/ingestion/tests/cli_e2e/base/test_cli_db.py @@ -197,7 +197,10 @@ class CliDBBase(TestCase): processor_config = self.get_profiler_processor_config(time_partition) self.build_config_file( E2EType.PROFILER_PROCESSOR, - {"processor": processor_config}, + { + "processor": processor_config, + "includes": self.get_includes_schemas(), + }, ) result = self.run_command("profile") sink_status, source_status = self.retrieve_statuses(result) diff --git a/ingestion/tests/cli_e2e/test_cli_hive.py b/ingestion/tests/cli_e2e/test_cli_hive.py index 5feda7ed540..4692c39fd46 100644 --- a/ingestion/tests/cli_e2e/test_cli_hive.py +++ b/ingestion/tests/cli_e2e/test_cli_hive.py @@ -23,7 +23,7 @@ from .common_e2e_sqa_mixins import SQACommonMethods class HiveCliTest(CliCommonDB.TestSuite, SQACommonMethods): create_table_query: str = """ - CREATE TABLE e2e_cli_tests.persons ( + CREATE TABLE IF NOT EXISTS e2e_cli_tests.persons ( person_id int, full_name varchar(255), birthdate date @@ -31,7 +31,7 @@ class HiveCliTest(CliCommonDB.TestSuite, SQACommonMethods): """ create_view_query: str = """ - CREATE VIEW e2e_cli_tests.view_persons AS + CREATE OR REPLACE VIEW e2e_cli_tests.view_persons AS SELECT * FROM e2e_cli_tests.persons """