From c909ff885768602a2619fee86c0b8d08efc537cf Mon Sep 17 00:00:00 2001 From: IceS2 Date: Mon, 8 Apr 2024 15:58:32 +0200 Subject: [PATCH] MINOR: Fix e2e tests (#15829) * Update values * Update values * Fix checkstyle --- ingestion/tests/cli_e2e/test_cli_metabase.py | 4 +-- ingestion/tests/cli_e2e/test_cli_oracle.py | 30 ++++++++++---------- ingestion/tests/cli_e2e/test_cli_tableau.py | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ingestion/tests/cli_e2e/test_cli_metabase.py b/ingestion/tests/cli_e2e/test_cli_metabase.py index b92c441cb78..9a754b35022 100644 --- a/ingestion/tests/cli_e2e/test_cli_metabase.py +++ b/ingestion/tests/cli_e2e/test_cli_metabase.py @@ -70,10 +70,10 @@ class MetabaseCliTest(CliCommonDashboard.TestSuite): return 0 def expected_filtered_mix(self) -> int: - return 3 + return 4 def expected_filtered_sink_mix(self) -> int: - return 6 + return 7 def expected_dashboards_and_charts_after_patch(self) -> int: return 0 diff --git a/ingestion/tests/cli_e2e/test_cli_oracle.py b/ingestion/tests/cli_e2e/test_cli_oracle.py index c1dc65a7b74..5589a0081d0 100644 --- a/ingestion/tests/cli_e2e/test_cli_oracle.py +++ b/ingestion/tests/cli_e2e/test_cli_oracle.py @@ -46,7 +46,7 @@ class OracleCliTest(CliCommonDB.TestSuite, SQACommonMethods): insert_data_queries: List[str] = [ """ - INSERT INTO admin.admin_emp (empno, ename, ssn, job, mgr, sal, comm, comments, status) WITH names AS ( + INSERT INTO admin.admin_emp (empno, ename, ssn, job, mgr, sal, comm, comments, status) WITH names AS ( SELECT 1, 'John Doe', 12356789, 'Manager', 121, 5200.0, 5000.0, 'Amazing', 'Active' FROM dual UNION ALL SELECT 2, 'Jane Doe', 123467189, 'Clerk', 131, 503.0, 5000.0, 'Wow', 'Active' FROM dual UNION ALL SELECT 3, 'Jon Doe', 123562789, 'Assistant', 141, 5000.0, 5000.0, 'Nice', 'Active' FROM dual UNION ALL @@ -124,15 +124,15 @@ SELECT * from names @staticmethod def expected_filtered_table_includes() -> int: - return 42 + return 43 @staticmethod def expected_filtered_table_excludes() -> int: - return 28 + return 29 @staticmethod def expected_filtered_mix() -> int: - return 42 + return 43 def test_create_table_with_profiler(self) -> None: # delete table in case it exists @@ -251,16 +251,16 @@ SELECT * from names def assert_for_vanilla_ingestion( self, source_status: Status, sink_status: Status ) -> None: - self.assertTrue(len(source_status.failures) == 0) - self.assertTrue(len(source_status.warnings) == 0) - self.assertTrue(len(source_status.filtered) == 28) - self.assertTrue( - (len(source_status.records) + len(source_status.updated_records)) - >= self.expected_tables() + self.assertEqual(len(source_status.failures), 0) + self.assertEqual(len(source_status.warnings), 0) + self.assertEqual(len(source_status.filtered), 29) + self.assertGreaterEqual( + (len(source_status.records) + len(source_status.updated_records)), + self.expected_tables(), ) - self.assertTrue(len(sink_status.failures) == 0) - self.assertTrue(len(sink_status.warnings) == 0) - self.assertTrue( - (len(sink_status.records) + len(sink_status.updated_records)) - > self.expected_tables() + self.assertEqual(len(sink_status.failures), 0) + self.assertEqual(len(sink_status.warnings), 0) + self.assertGreater( + (len(sink_status.records) + len(sink_status.updated_records)), + self.expected_tables(), ) diff --git a/ingestion/tests/cli_e2e/test_cli_tableau.py b/ingestion/tests/cli_e2e/test_cli_tableau.py index d23ad04cafc..faa51f1b19e 100644 --- a/ingestion/tests/cli_e2e/test_cli_tableau.py +++ b/ingestion/tests/cli_e2e/test_cli_tableau.py @@ -71,7 +71,7 @@ class TableauCliTest(CliCommonDashboard.TestSuite): return 2 def expected_filtered_sink_mix(self) -> int: - return 9 + return 10 def expected_dashboards_and_charts_after_patch(self) -> int: - return 2 + return 4