Fix E2E tests (#11226)

This commit is contained in:
Ayush Shah 2023-04-25 10:11:06 +05:30 committed by GitHub
parent aa492ffda7
commit efd82113ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 18 deletions

View File

@ -118,6 +118,8 @@ jobs:
E2E_METABASE_HOST_PORT: ${{ secrets.TEST_METABASE_HOST_PORT }}
E2E_METABASE_PASSWORD: ${{ secrets.TEST_METABASE_PASSWORD }}
E2E_METABASE_USERNAME: ${{ secrets.TEST_METABASE_USERNAME }}
E2E_HIVE_HOST_PORT: ${{ secrets.E2E_HIVE_HOST_PORT }}
E2E_HIVE_AUTH: ${{ secrets.E2E_HIVE_AUTH }}
run: |
source env/bin/activate
export SITE_CUSTOMIZE_PATH=$(python -c "import site; import os; from pathlib import Path; print(os.path.relpath(site.getsitepackages()[0], str(Path.cwd())))")/sitecustomize.py

View File

@ -1,11 +0,0 @@
DROP DATABASE IF EXISTS E2E_DB;
CREATE OR REPLACE DATABASE E2E_DB;
USE E2E_DB;
CREATE OR REPLACE SCHEMA e2e_test;
CREATE OR REPLACE TABLE e2e_test.regions(region_id INT PRIMARY KEY,region_name VARCHAR(25));
CREATE OR REPLACE TABLE e2e_test.countries(country_id CHAR(2) PRIMARY KEY,country_name VARCHAR (40),region_id INT NOT NULL);
CREATE OR REPLACE TABLE e2e_test.locations(e2e_testlocation_id INT PRIMARY KEY,e2e_teststreet_address VARCHAR (40),e2e_testpostal_code VARCHAR (12),e2e_testcity VARCHAR (30) NOT NULL,e2e_teststate_province VARCHAR (25),e2e_testcountry_id CHAR (2) NOT NULL);
CREATE OR REPLACE TABLE e2e_test.jobs(e2e_testjob_id INT PRIMARY KEY,e2e_testjob_title VARCHAR (35) NOT NULL,e2e_testmin_salary DECIMAL (8, 2),e2e_testmax_salary DECIMAL (8, 2));
CREATE OR REPLACE TABLE e2e_test.test_departments(e2e_testdepartment_id INT PRIMARY KEY,e2e_testdepartment_name VARCHAR (30) NOT NULL,e2e_testlocation_id INT);
CREATE OR REPLACE TABLE e2e_test.test_employees(e2e_testemployee_id INT PRIMARY KEY,e2e_testfirst_name VARCHAR (20),e2e_testlast_name VARCHAR (25) NOT NULL,e2e_testemail VARCHAR (100) NOT NULL,e2e_testphone_number VARCHAR (20),e2e_testhire_date DATE NOT NULL,e2e_testjob_id INT NOT NULL,e2e_testsalary DECIMAL (8, 2) NOT NULL,e2e_testmanager_id INT,e2e_testdepartment_id INT);
CREATE OR REPLACE TABLE e2e_test.test_dependents(e2e_testdependent_id INT PRIMARY KEY,e2e_testfirst_name VARCHAR (50) NOT NULL,e2e_testlast_name VARCHAR (50) NOT NULL,e2e_testrelationship VARCHAR (25) NOT NULL,e2e_testemployee_id INT NOT NULL);

View File

@ -75,15 +75,15 @@ class BigqueryCliTest(CliCommonDB.TestSuite, SQACommonMethods):
@staticmethod
def get_includes_schemas() -> List[str]:
return ["testschema"]
return ["exclude_me"]
@staticmethod
def get_includes_tables() -> List[str]:
return ["testtable"]
return ["exclude_table"]
@staticmethod
def get_excludes_tables() -> List[str]:
return ["exclude_table"]
return ["testtable"]
@staticmethod
def expected_filtered_schema_includes() -> int:

View File

@ -23,7 +23,7 @@ from .common_e2e_sqa_mixins import SQACommonMethods
class RedshiftCliTest(CliCommonDB.TestSuite, SQACommonMethods):
create_table_query: str = """
CREATE TABLE e2e_cli_tests.dbt_jaffle.persons (
CREATE TABLE IF NOT EXISTS e2e_cli_tests.dbt_jaffle.persons (
person_id int,
full_name varchar(255),
birthdate date
@ -31,7 +31,7 @@ class RedshiftCliTest(CliCommonDB.TestSuite, SQACommonMethods):
"""
create_view_query: str = """
CREATE VIEW e2e_cli_tests.dbt_jaffle.view_persons AS
CREATE OR REPLACE VIEW e2e_cli_tests.dbt_jaffle.view_persons AS
SELECT *
FROM e2e_cli_tests.dbt_jaffle.persons;
"""
@ -49,11 +49,11 @@ class RedshiftCliTest(CliCommonDB.TestSuite, SQACommonMethods):
]
drop_table_query: str = """
DROP TABLE IF EXISTS e2e_cli_tests.dbt_jaffle.persons;
DROP TABLE IF EXISTS "e2e_cli_tests"."dbt_jaffle"."persons";
"""
drop_view_query: str = """
DROP VIEW IF EXISTS e2e_cli_tests.dbt_jaffle.view_persons;
DROP VIEW IF EXISTS "e2e_cli_tests"."dbt_jaffle"."view_persons";
"""
def setUp(self) -> None:

View File

@ -28,6 +28,20 @@ class SnowflakeCliTest(CliCommonDB.TestSuite):
Snowflake CLI Tests
"""
prepare_snowflake_e2e: List[str] = [
"DROP DATABASE IF EXISTS E2E_DB;",
"CREATE OR REPLACE DATABASE E2E_DB;",
"USE E2E_DB;",
"CREATE OR REPLACE SCHEMA e2e_test;",
"CREATE OR REPLACE TABLE e2e_test.regions(region_id INT PRIMARY KEY,region_name VARCHAR(25));",
"CREATE OR REPLACE TABLE e2e_test.countries(country_id CHAR(2) PRIMARY KEY,country_name VARCHAR (40),region_id INT NOT NULL);",
"CREATE OR REPLACE TABLE e2e_test.locations(e2e_testlocation_id INT PRIMARY KEY,e2e_teststreet_address VARCHAR (40),e2e_testpostal_code VARCHAR (12),e2e_testcity VARCHAR (30) NOT NULL,e2e_teststate_province VARCHAR (25),e2e_testcountry_id CHAR (2) NOT NULL);",
"CREATE OR REPLACE TABLE e2e_test.jobs(e2e_testjob_id INT PRIMARY KEY,e2e_testjob_title VARCHAR (35) NOT NULL,e2e_testmin_salary DECIMAL (8, 2),e2e_testmax_salary DECIMAL (8, 2));",
"CREATE OR REPLACE TABLE e2e_test.test_departments(e2e_testdepartment_id INT PRIMARY KEY,e2e_testdepartment_name VARCHAR (30) NOT NULL,e2e_testlocation_id INT);",
"CREATE OR REPLACE TABLE e2e_test.test_employees(e2e_testemployee_id INT PRIMARY KEY,e2e_testfirst_name VARCHAR (20),e2e_testlast_name VARCHAR (25) NOT NULL,e2e_testemail VARCHAR (100) NOT NULL,e2e_testphone_number VARCHAR (20),e2e_testhire_date DATE NOT NULL,e2e_testjob_id INT NOT NULL,e2e_testsalary DECIMAL (8, 2) NOT NULL,e2e_testmanager_id INT,e2e_testdepartment_id INT);",
"CREATE OR REPLACE TABLE e2e_test.test_dependents(e2e_testdependent_id INT PRIMARY KEY,e2e_testfirst_name VARCHAR (50) NOT NULL,e2e_testlast_name VARCHAR (50) NOT NULL,e2e_testrelationship VARCHAR (25) NOT NULL,e2e_testemployee_id INT NOT NULL);",
]
create_table_query: str = """
CREATE TABLE E2E_DB.e2e_test.persons (
person_id int,
@ -54,6 +68,11 @@ class SnowflakeCliTest(CliCommonDB.TestSuite):
DROP VIEW IF EXISTS E2E_DB.e2e_test.view_persons;
"""
def setUp(self) -> None:
with self.engine.connect() as connection:
for sql_statements in self.prepare_snowflake_e2e:
connection.execute(sql_statements)
@staticmethod
def get_connector_name() -> str:
return "snowflake"