From 6fa2497adfcb2a3ce8b119b7caa6a1f0ff4a30f9 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Mon, 14 Sep 2020 11:29:20 +1000 Subject: Move setup to helper function --- acceptance_test.go | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'acceptance_test.go') diff --git a/acceptance_test.go b/acceptance_test.go index 03e9ec01..f652f9ad 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -447,21 +447,14 @@ func TestHttpsOnlyDomainDisabled(t *testing.T) { func TestPrometheusMetricsCanBeScraped(t *testing.T) { skipUnlessEnabled(t) - listener := []ListenSpec{{"http", "127.0.0.1", "37003"}} - var apiCalled bool - source := NewGitlabDomainsSourceStub(t, &apiCalled) - defer source.Close() - - gitLabAPISecretKey := CreateGitLabAPISecretKeyFixtureFile(t) - - pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", gitLabAPISecretKey, "-domain-config-source", "gitlab"} - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listener, ":42345", []string{}, pagesArgs...) + teardown := RunPagesProcessWithStubGitLabServer(t, true, *pagesBinary, listeners, ":42345", []string{}) defer teardown() // need to call an actual resource to populate certain metrics e.g. gitlab_pages_domains_source_api_requests_total - _, err := GetPageFromListener(t, listener[0], "new-source-test.gitlab.io", "") + res, err := GetPageFromListener(t, httpListener, "new-source-test.gitlab.io", "/my/pages/project/") require.NoError(t, err) + require.Equal(t, http.StatusOK, res.StatusCode) resp, err := http.Get("http://localhost:42345/metrics") require.NoError(t, err) @@ -478,13 +471,13 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { require.Contains(t, string(body), "gitlab_pages_last_domain_update_seconds gauge") require.Contains(t, string(body), "gitlab_pages_domains_configuration_update_duration gauge") // end TODO - require.Contains(t, string(body), "gitlab_pages_domains_source_cache_hit 3") - require.Contains(t, string(body), "gitlab_pages_domains_source_cache_miss 2") - require.Contains(t, string(body), "gitlab_pages_domains_source_failures_total 0") + require.Contains(t, string(body), "gitlab_pages_domains_source_cache_hit") + require.Contains(t, string(body), "gitlab_pages_domains_source_cache_miss") + require.Contains(t, string(body), "gitlab_pages_domains_source_failures_total") require.Contains(t, string(body), "gitlab_pages_serverless_requests 0") require.Contains(t, string(body), "gitlab_pages_serverless_latency_sum 0") - require.Contains(t, string(body), "gitlab_pages_disk_serving_file_size_bytes_sum 0") - require.Contains(t, string(body), "gitlab_pages_serving_time_seconds_sum 0") + require.Contains(t, string(body), "gitlab_pages_disk_serving_file_size_bytes_sum") + require.Contains(t, string(body), "gitlab_pages_serving_time_seconds_sum") require.Contains(t, string(body), `gitlab_pages_domains_source_api_requests_total{status_code="200"}`) require.Contains(t, string(body), `gitlab_pages_domains_source_api_call_duration{status_code="200"}`) // TODO: add test when Zip is enabled https://gitlab.com/gitlab-org/gitlab-pages/-/issues/443 -- cgit v1.2.3