fixed e2e test after patch and collate demo (#14321)

ingestion/tests/cli_e2e/common/test_cli_dashboard.py

@@ -79,7 +79,7 @@ class CliCommonDashboard:
             self.assertTrue(len(source_status.filtered) == 0)
             self.assertEqual(
                 len(source_status.records),
-                self.expected_dashboards_and_charts()
+                self.expected_dashboards_and_charts_after_patch()
                 + self.expected_tags()
                 + self.expected_lineage()
                 + self.expected_datamodels()
@@ -89,7 +89,7 @@ class CliCommonDashboard:
             self.assertTrue(len(sink_status.warnings) == 0)
             self.assertEqual(
                 len(sink_status.records),
-                self.expected_dashboards_and_charts()
+                self.expected_dashboards_and_charts_after_patch()
                 + self.expected_tags()
                 + self.expected_lineage()
                 + self.expected_datamodels()
@@ -140,3 +140,10 @@ class CliCommonDashboard:
         @abstractmethod
         def expected_filtered_sink_mix() -> int:
             raise NotImplementedError()
+
+        # We need to update the counts in the subsequent run of ingestion for same service
+        # Since we only patch the entities if we find any change at the source
+        @staticmethod
+        @abstractmethod
+        def expected_dashboards_and_charts_after_patch() -> int:
+            raise NotImplementedError()

ingestion/tests/cli_e2e/test_cli_metabase.py

@@ -75,3 +75,6 @@ class MetabaseCliTest(CliCommonDashboard.TestSuite):
 
     def expected_filtered_sink_mix(self) -> int:
         return 6
+
+    def expected_dashboards_and_charts_after_patch(self) -> int:
+        return 1

ingestion/tests/cli_e2e/test_cli_powerbi.py

@@ -54,7 +54,7 @@ class PowerBICliTest(CliCommonDashboard.TestSuite):
         return []
 
     def expected_datamodels(self) -> int:
-        return 9
+        return 11
 
     def expected_dashboards_and_charts(self) -> int:
         return 83
@@ -63,13 +63,16 @@ class PowerBICliTest(CliCommonDashboard.TestSuite):
         return 44
 
     def expected_datamodel_lineage(self) -> int:
-        return 13
+        return 25
 
     def expected_tags(self) -> int:
         return 0
 
     def expected_filtered_mix(self) -> int:
-        return 19
+        return 21
 
     def expected_filtered_sink_mix(self) -> int:
-        return 46
+        return 41
+
+    def expected_dashboards_and_charts_after_patch(self) -> int:
+        return 1

ingestion/tests/cli_e2e/test_cli_quicksight.py

@@ -50,7 +50,7 @@ class QuicksightCliTest(CliCommonDashboard.TestSuite):
         return 0
 
     def expected_filtered_sink_mix(self) -> int:
-        return 6
+        return 1
 
     # Quicksight do not ingest tags
     def expected_tags(self) -> int:
@@ -69,3 +69,6 @@ class QuicksightCliTest(CliCommonDashboard.TestSuite):
 
     def expected_datamodels(self) -> int:
         return 0
+
+    def expected_dashboards_and_charts_after_patch(self) -> int:
+        return 1

ingestion/tests/cli_e2e/test_cli_redash.py

@@ -62,3 +62,6 @@ class RedashCliTest(CliCommonDashboard.TestSuite):
 
     def expected_filtered_sink_mix(self) -> int:
         return 9
+
+    def expected_dashboards_and_charts_after_patch(self) -> int:
+        return 2

ingestion/tests/cli_e2e/test_cli_tableau.py

@@ -72,4 +72,7 @@ class TableauCliTest(CliCommonDashboard.TestSuite):
         return 2
 
     def expected_filtered_sink_mix(self) -> int:
-        return 9
+        return 13
+
+    def expected_dashboards_and_charts_after_patch(self) -> int:
+        return 5