fixed test

tests/integration_tests/dashboards/api_tests.py

@@ -1343,7 +1343,7 @@ def test_export(self):
         dashboards_ids = get_dashboards_ids(db, ["world_health", "births"])
         uri = f"api/v1/dashboard/export/?q={prison.dumps(dashboards_ids)}"
 
-        rv = self.client.get(uri)
+        rv = self.get_assert_metric(uri, "export")
         headers = generate_download_headers("json")["Content-Disposition"]
 
         assert rv.status_code == 200

tests/integration_tests/sqllab_tests.py

@@ -152,35 +152,36 @@ def test_sql_json_dml_disallowed(self):
             ]
         }
 
-    # @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
-    # def test_sql_json_to_saved_query_info(self):
-    #     """
-    #     SQLLab: Test SQLLab query execution info propagation to saved queries
-    #     """
-    #     from freezegun import freeze_time
-    #
-    #     self.login("admin")
-    #
-    #     sql_statement = "SELECT * FROM birth_names LIMIT 10"
-    #     examples_db_id = get_example_database().id
-    #     saved_query = SavedQuery(db_id=examples_db_id, sql=sql_statement)
-    #     db.session.add(saved_query)
-    #     db.session.commit()
-    #
-    #     with freeze_time("2020-01-01T00:00:00Z"):
-    #         self.run_sql(sql_statement, "1")
-    #         saved_query_ = (
-    #             db.session.query(SavedQuery)
-    #             .filter(
-    #                 SavedQuery.db_id == examples_db_id, SavedQuery.sql == sql_statement
-    #             )
-    #             .one_or_none()
-    #         )
-    #         assert saved_query_.rows is not None
-    #         assert saved_query_.last_run == datetime.now()
-    #         # Rollback changes
-    #         db.session.delete(saved_query_)
-    #         db.session.commit()
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_sql_json_to_saved_query_info(self):
+        """
+        SQLLab: Test SQLLab query execution info propagation to saved queries
+        """
+        from freezegun import freeze_time
+
+        self.login("admin")
+
+        sql_statement = "SELECT * FROM birth_names LIMIT 10"
+        examples_db_id = get_example_database().id
+        saved_query = SavedQuery(db_id=examples_db_id, sql=sql_statement)
+        db.session.add(saved_query)
+        db.session.commit()
+
+        current_time = datetime.now()
+        with freeze_time(current_time):
+            self.run_sql(sql_statement, "1")
+            saved_query_ = (
+                db.session.query(SavedQuery)
+                .filter(
+                    SavedQuery.db_id == examples_db_id, SavedQuery.sql == sql_statement
+                )
+                .one_or_none()
+            )
+            assert saved_query_.rows is not None
+            assert saved_query_.last_run == current_time
+        # Rollback changes
+        db.session.delete(saved_query_)
+        db.session.commit()
 
     @parameterized.expand([CtasMethod.TABLE, CtasMethod.VIEW])
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")