Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix flaky debug metadata tests (#6621)
Artur Pata52f959eef920
diff --git a/test/plausible_web/controllers/api/external_stats_controller/debug_metadata_test.exs b/test/plausible_web/controllers/api/external_stats_controller/debug_metadata_test.exsindex eb76ad0858..a88d598340 100644--- a/test/plausible_web/controllers/api/external_stats_controller/debug_metadata_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/debug_metadata_test.exs@@ -1,5 +1,4 @@defmodule PlausibleWeb.Api.ExternalController.DebugMetadataTest do- alias Plausible.{IngestRepo, ClickhouseRepo}use PlausibleWeb.ConnCasedescribe "Debug metadata" do@@ -20,13 +19,11 @@ defmodule PlausibleWeb.Api.ExternalController.DebugMetadataTest doassert json_response(conn, 200)- IngestRepo.query!("SYSTEM FLUSH LOGS")-- %{rows: [r1, r2]} =- ClickhouseRepo.query!(- "FROM system.query_log SELECT log_comment WHERE JSONExtractString(log_comment, 'site_domain') = {$0:String}",- [site.domain]- )+ assert [r1, r2] =+ eventually(fn ->+ rows = get_entries_from_query_log(site.domain)+ {length(rows) == 2, rows}+ end)for [unparsed_log_comment] <- [r1, r2] dodecoded = Jason.decode!(unparsed_log_comment)diff --git a/test/plausible_web/controllers/api/stats_controller/debug_metadata_test.exs b/test/plausible_web/controllers/api/stats_controller/debug_metadata_test.exsindex 982d31285d..10ae5e3af4 100644--- a/test/plausible_web/controllers/api/stats_controller/debug_metadata_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/debug_metadata_test.exs@@ -1,5 +1,4 @@defmodule PlausibleWeb.Api.StatsController.DebugMetadataTest do- alias Plausible.{IngestRepo, ClickhouseRepo}use PlausibleWeb.ConnCasedescribe "Debug metadata for logged in requests" do@@ -17,13 +16,11 @@ defmodule PlausibleWeb.Api.StatsController.DebugMetadataTest doassert json_response(conn, 200)- IngestRepo.query!("SYSTEM FLUSH LOGS")-- %{rows: [r1, r2]} =- ClickhouseRepo.query!(- "FROM system.query_log SELECT log_comment WHERE JSONExtractString(log_comment, 'site_domain') = {$0:String}",- [site.domain]- )+ assert [r1, r2] =+ eventually(fn ->+ rows = get_entries_from_query_log(site.domain)+ {length(rows) == 2, rows}+ end)for [unparsed_log_comment] <- [r1, r2] dodecoded = Jason.decode!(unparsed_log_comment)@@ -89,13 +86,11 @@ defmodule PlausibleWeb.Api.StatsController.DebugMetadataTest doassert json_response(conn, 200)- IngestRepo.query!("SYSTEM FLUSH LOGS")-- %{rows: [r1, r2]} =- ClickhouseRepo.query!(- "FROM system.query_log SELECT log_comment WHERE JSONExtractString(log_comment, 'site_domain') = {$0:String}",- [site.domain]- )+ assert [r1, r2] =+ eventually(fn ->+ rows = get_entries_from_query_log(site.domain)+ {length(rows) == 2, rows}+ end)for [unparsed_log_comment] <- [r1, r2] dodecoded = Jason.decode!(unparsed_log_comment)diff --git a/test/support/test_utils.ex b/test/support/test_utils.exindex f48c6bfbf0..2857182d1d 100644--- a/test/support/test_utils.ex+++ b/test/support/test_utils.ex@@ -267,6 +267,18 @@ defmodule Plausible.TestUtils do)end+ def get_entries_from_query_log(site_domain) do+ Plausible.IngestRepo.query!("SYSTEM FLUSH LOGS")++ %{rows: rows} =+ Plausible.ClickhouseRepo.query!(+ "FROM system.query_log SELECT log_comment WHERE JSONExtractString(log_comment, 'site_domain') = {$0:String}",+ [site_domain]+ )++ rows+ end+def random_ip() doEnum.map_join(1..4, ".", fn _ -> Enum.random(1..254) end)end