Merge branch 'window-functions-tests' of github.com:Altinity/clickhou…

…se-grafana into window-functions-tests
Altinity · Dec 23, 2024 · 9f19f33 · 9f19f33
2 parents 9c69569 + 806e351
commit 9f19f33
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
@@ -113,30 +113,30 @@ def regression(self, before, after):
 
     self.context.grafana_version = None
     Feature(run=load("testflows.tests.automated.window_functions", "feature"))
-    # Feature(run=load("testflows.tests.automated.sql_editor", "feature"))
-    # Feature(run=load("testflows.tests.automated.data_source_setup", "feature"))
-    # Feature(run=load("testflows.tests.automated.e2e", "feature"))
-    # Feature(run=load("testflows.tests.automated.query_options", "feature"))
-    # Feature(run=load("testflows.tests.automated.functions", "feature"))
-    # Feature(run=load("testflows.tests.automated.macros", "feature"))
-    # Feature(run=load("testflows.tests.automated.adhoc_macro", "feature"))
-    # Feature(run=load("testflows.tests.automated.unified_alerts", "feature"))
-    #
-    #
-    # self.context.grafana_version = "10.4.3"
-    # with Given("I define endpoint with grafana version that contains legacy alerts"):
-    #     self.context.endpoint = define("self.context.endpoint", "http://grafana_legacy_alerts:3000/")
-    #
-    # with And("I wait for grafana to be started"):
-    #     for attempt in retries(delay=10, timeout=50):
-    #         with attempt:
-    #             ui.open_endpoint(endpoint=self.context.endpoint)
-    #
-    # with delay():
-    #     with Given("I login in grafana"):
-    #         login.login()
-    #
-    # Feature(run=load("testflows.tests.automated.legacy_alerts", "feature"))
+    Feature(run=load("testflows.tests.automated.sql_editor", "feature"))
+    Feature(run=load("testflows.tests.automated.data_source_setup", "feature"))
+    Feature(run=load("testflows.tests.automated.e2e", "feature"))
+    Feature(run=load("testflows.tests.automated.query_options", "feature"))
+    Feature(run=load("testflows.tests.automated.functions", "feature"))
+    Feature(run=load("testflows.tests.automated.macros", "feature"))
+    Feature(run=load("testflows.tests.automated.adhoc_macro", "feature"))
+    Feature(run=load("testflows.tests.automated.unified_alerts", "feature"))
+
+
+    self.context.grafana_version = "10.4.3"
+    with Given("I define endpoint with grafana version that contains legacy alerts"):
+        self.context.endpoint = define("self.context.endpoint", "http://grafana_legacy_alerts:3000/")
+
+    with And("I wait for grafana to be started"):
+        for attempt in retries(delay=10, timeout=50):
+            with attempt:
+                ui.open_endpoint(endpoint=self.context.endpoint)
+
+    with delay():
+        with Given("I login in grafana"):
+            login.login()
+
+    Feature(run=load("testflows.tests.automated.legacy_alerts", "feature"))
 
 
 if main():