Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix e2e tests #19130

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ingestion/tests/cli_e2e/base/config_builders/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def build(self) -> dict:
"type": "AutoClassification",
"storeSampleData": True,
"enableAutoClassification": False,
"profileSample": self.profilerSample,
}
}

Expand Down
2 changes: 0 additions & 2 deletions ingestion/tests/cli_e2e/database/mysql/mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,3 @@ workflowConfig:
authProvider: openmetadata
securityConfig:
jwtToken: "eyJraWQiOiJHYjM4OWEtOWY3Ni1nZGpzLWE5MmotMDI0MmJrOTQzNTYiLCJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImlzQm90IjpmYWxzZSwiaXNzIjoib3Blbi1tZXRhZGF0YS5vcmciLCJpYXQiOjE2NjM5Mzg0NjIsImVtYWlsIjoiYWRtaW5Ab3Blbm1ldGFkYXRhLm9yZyJ9.tS8um_5DKu7HgzGBzS1VTA5uUjKWOCU0B_j08WXBiEC0mr0zNREkqVfwFDD-d24HlNEbrqioLsBuFRiwIWKc1m_ZlVQbG7P36RUxhuv2vbSp80FKyNM-Tj93FDzq91jsyNmsQhyNv_fNr3TXfzzSPjHt8Go0FMMP66weoKMgW2PbXlhVKwEuXUHyakLLzewm9UMeQaEiRzhiTMU3UkLXcKbYEJJvfNFcLwSl9W8JCO_l0Yj3ud-qt_nQYEZwqW6u5nfdQllN133iikV4fM5QZsMCnm8Rq1mvLR0y9bmJiD7fwM1tmJ791TUWqmKaTnP49U493VanKpUAfzIiOiIbhg"


4 changes: 2 additions & 2 deletions ingestion/tests/cli_e2e/test_cli_mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ def expected_filtered_schema_excludes() -> int:

@staticmethod
def expected_filtered_table_includes() -> int:
return 84
return 134

@staticmethod
def expected_filtered_table_excludes() -> int:
return 4

@staticmethod
def expected_filtered_mix() -> int:
return 84
return 134
9 changes: 9 additions & 0 deletions ingestion/tests/cli_e2e/test_cli_oracle.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

from typing import List

import pytest

from metadata.ingestion.api.status import Status

from .base.e2e_types import E2EType
Expand Down Expand Up @@ -139,6 +141,7 @@ def expected_filtered_table_excludes() -> int:
def expected_filtered_mix() -> int:
return 43

@pytest.mark.order(2)
def test_create_table_with_profiler(self) -> None:
# delete table in case it exists
self.delete_table_and_view()
Expand All @@ -162,6 +165,7 @@ def test_create_table_with_profiler(self) -> None:
sink_status, source_status = self.retrieve_statuses(result)
self.assert_for_table_with_profiler(source_status, sink_status)

@pytest.mark.order(4)
def test_delete_table_is_marked_as_deleted(self) -> None:
"""3. delete the new table + deploy marking tables as deleted

Expand All @@ -180,6 +184,7 @@ def test_delete_table_is_marked_as_deleted(self) -> None:
sink_status, source_status = self.retrieve_statuses(result)
self.assert_for_delete_table_is_marked_as_deleted(source_status, sink_status)

@pytest.mark.order(5)
def test_schema_filter_includes(self) -> None:
self.build_config_file(
E2EType.INGEST_DB_FILTER_MIX,
Expand All @@ -195,9 +200,11 @@ def test_schema_filter_includes(self) -> None:
sink_status, source_status = self.retrieve_statuses(result)
self.assert_filtered_tables_includes(source_status, sink_status)

@pytest.mark.order(6)
def test_schema_filter_excludes(self) -> None:
pass

@pytest.mark.order(7)
def test_table_filter_includes(self) -> None:
"""6. Vanilla ingestion + include table filter pattern

Expand All @@ -217,6 +224,7 @@ def test_table_filter_includes(self) -> None:
sink_status, source_status = self.retrieve_statuses(result)
self.assert_filtered_tables_includes(source_status, sink_status)

@pytest.mark.order(1)
def test_vanilla_ingestion(self) -> None:
"""6. Vanilla ingestion

Expand All @@ -233,6 +241,7 @@ def test_vanilla_ingestion(self) -> None:
sink_status, source_status = self.retrieve_statuses(result)
self.assert_for_vanilla_ingestion(source_status, sink_status)

@pytest.mark.order(8)
def test_table_filter_excludes(self) -> None:
"""7. Vanilla ingestion + exclude table filter pattern

Expand Down
6 changes: 3 additions & 3 deletions ingestion/tests/cli_e2e/test_cli_powerbi.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def expected_datamodels(self) -> int:
return 16

def expected_dashboards_and_charts(self) -> int:
return 89
return 96

def expected_lineage(self) -> int:
return 44
Expand All @@ -68,10 +68,10 @@ def expected_tags(self) -> int:
return 0

def expected_filtered_mix(self) -> int:
return 24
return 26

def expected_filtered_sink_mix(self) -> int:
return 53
return 57

def expected_dashboards_and_charts_after_patch(self) -> int:
return 0
Loading