From d145341026e3b74da9c18d319b578faaaf12ec2a Mon Sep 17 00:00:00 2001 From: IceS2 Date: Fri, 19 Jul 2024 10:32:22 +0200 Subject: [PATCH] MINOR: Fix Oracle E2E Tests (#17084) * Fix Oracle E2E Tests * Fix Checkstyle * Add link to issue in the reason --- ingestion/src/metadata/cmd.py | 4 ++-- ingestion/tests/cli_e2e/test_cli_oracle.py | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ingestion/src/metadata/cmd.py b/ingestion/src/metadata/cmd.py index 19a9c45709b..809b5064eca 100644 --- a/ingestion/src/metadata/cmd.py +++ b/ingestion/src/metadata/cmd.py @@ -18,7 +18,7 @@ from http.server import BaseHTTPRequestHandler, HTTPServer from pathlib import Path # pyright: reportUnusedCallResult=false -from typing import List, Optional +from typing import List, Optional, Union from metadata.__version__ import get_metadata_version from metadata.cli.app import run_app @@ -157,7 +157,7 @@ def metadata(args: Optional[List[str]] = None): if contains_args.get("debug"): set_loggers_level(logging.DEBUG) else: - log_level: str = contains_args.get("log_level", logging.INFO) + log_level: Union[str, int] = contains_args.get("log_level") or logging.INFO set_loggers_level(log_level) if path and metadata_workflow and metadata_workflow in RUN_PATH_METHODS: diff --git a/ingestion/tests/cli_e2e/test_cli_oracle.py b/ingestion/tests/cli_e2e/test_cli_oracle.py index b89cb599c2f..f870b17da43 100644 --- a/ingestion/tests/cli_e2e/test_cli_oracle.py +++ b/ingestion/tests/cli_e2e/test_cli_oracle.py @@ -15,6 +15,8 @@ Oracle E2E tests from typing import List +import pytest + from metadata.ingestion.api.status import Status from .base.e2e_types import E2EType @@ -96,11 +98,11 @@ SELECT * from names @staticmethod def fqn_created_table() -> str: - return "e2e_oracle.default.admin.ADMIN_EMP" + return "e2e_oracle.default.admin.admin_emp" @staticmethod def _fqn_deleted_table() -> str: - return "e2e_oracle.default.admin.ADMIN_EMP" + return "e2e_oracle.default.admin.admin_emp" @staticmethod def get_includes_schemas() -> List[str]: @@ -128,12 +130,15 @@ SELECT * from names @staticmethod def expected_filtered_table_excludes() -> int: - return 29 + return 30 @staticmethod def expected_filtered_mix() -> int: return 43 + @pytest.mark.xfail( + reason="Issue Raised: https://github.com/open-metadata/OpenMetadata/issues/17085" + ) def test_create_table_with_profiler(self) -> None: # delete table in case it exists self.delete_table_and_view() @@ -240,7 +245,7 @@ SELECT * from names E2EType.INGEST_DB_FILTER_MIX, { "schema": {"includes": self.get_includes_schemas()}, - "table": {"excludes": self.get_includes_tables()}, + "table": {"excludes": self.get_excludes_tables()}, }, )