From cbe1d51e2a0888a1801fc1f248e144cb4872a2fb Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 23 Nov 2021 11:14:20 +1100 Subject: [PATCH] Minor test refactoring --- test/client_test.rb | 3 ++- test/instrumentation/active_record_test.rb | 2 +- test/instrumentation/method_profiler_test.rb | 2 +- test/metric/base_test.rb | 2 +- test/metric/counter_test.rb | 2 +- test/metric/gauge_test.rb | 2 +- test/metric/histogram_test.rb | 2 +- test/metric/summary_test.rb | 2 +- test/middleware_test.rb | 2 +- test/prometheus_exporter_test.rb | 2 +- test/server/active_record_collector_test.rb | 2 +- test/server/collector_test.rb | 2 +- test/server/puma_collector_test.rb | 2 +- test/server/resque_collector_test.rb | 2 +- test/server/runner_test.rb | 2 +- test/server/sidekiq_process_collector_test.rb | 2 +- test/server/sidekiq_queue_collector_test.rb | 2 +- test/server/unicorn_collector_test.rb | 2 +- test/server/web_collector_test.rb | 2 +- test/server/web_server_test.rb | 5 +++-- 20 files changed, 23 insertions(+), 21 deletions(-) diff --git a/test/client_test.rb b/test/client_test.rb index 91450ae..5505114 100644 --- a/test/client_test.rb +++ b/test/client_test.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true -require "test_helper" +require_relative "test_helper" +require "prometheus_exporter/client" class PrometheusExporterTest < Minitest::Test def test_find_the_correct_registered_metric diff --git a/test/instrumentation/active_record_test.rb b/test/instrumentation/active_record_test.rb index 46f6246..cff9016 100644 --- a/test/instrumentation/active_record_test.rb +++ b/test/instrumentation/active_record_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/instrumentation' require 'active_record' diff --git a/test/instrumentation/method_profiler_test.rb b/test/instrumentation/method_profiler_test.rb index 309c3eb..ce23176 100644 --- a/test/instrumentation/method_profiler_test.rb +++ b/test/instrumentation/method_profiler_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/instrumentation' class PrometheusInstrumentationMethodProfilerTest < Minitest::Test diff --git a/test/metric/base_test.rb b/test/metric/base_test.rb index f248959..ed18d63 100644 --- a/test/metric/base_test.rb +++ b/test/metric/base_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/metric' module PrometheusExporter::Metric diff --git a/test/metric/counter_test.rb b/test/metric/counter_test.rb index d844492..fd2b672 100644 --- a/test/metric/counter_test.rb +++ b/test/metric/counter_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/metric' module PrometheusExporter::Metric diff --git a/test/metric/gauge_test.rb b/test/metric/gauge_test.rb index 748d8f8..f6b4b1d 100644 --- a/test/metric/gauge_test.rb +++ b/test/metric/gauge_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/metric' module PrometheusExporter::Metric diff --git a/test/metric/histogram_test.rb b/test/metric/histogram_test.rb index 23b6324..71457b4 100644 --- a/test/metric/histogram_test.rb +++ b/test/metric/histogram_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/metric' module PrometheusExporter::Metric diff --git a/test/metric/summary_test.rb b/test/metric/summary_test.rb index bf31134..c128526 100644 --- a/test/metric/summary_test.rb +++ b/test/metric/summary_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/metric' module PrometheusExporter::Metric diff --git a/test/middleware_test.rb b/test/middleware_test.rb index 52acc05..1f8c7d7 100644 --- a/test/middleware_test.rb +++ b/test/middleware_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "test_helper" +require_relative 'test_helper' require 'rack/test' require 'prometheus_exporter/middleware' diff --git a/test/prometheus_exporter_test.rb b/test/prometheus_exporter_test.rb index 7638b5c..573eee2 100644 --- a/test/prometheus_exporter_test.rb +++ b/test/prometheus_exporter_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "test_helper" +require_relative "test_helper" class PrometheusExporterTest < Minitest::Test def test_that_it_has_a_version_number diff --git a/test/server/active_record_collector_test.rb b/test/server/active_record_collector_test.rb index 938532a..5be9215 100644 --- a/test/server/active_record_collector_test.rb +++ b/test/server/active_record_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'mini_racer' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/collector_test.rb b/test/server/collector_test.rb index 04a868b..531e436 100644 --- a/test/server/collector_test.rb +++ b/test/server/collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'mini_racer' require 'prometheus_exporter/server' require 'prometheus_exporter/client' diff --git a/test/server/puma_collector_test.rb b/test/server/puma_collector_test.rb index 1b93c87..b9364cd 100644 --- a/test/server/puma_collector_test.rb +++ b/test/server/puma_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'mini_racer' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/resque_collector_test.rb b/test/server/resque_collector_test.rb index 5fa11b4..88144f9 100644 --- a/test/server/resque_collector_test.rb +++ b/test/server/resque_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/runner_test.rb b/test/server/runner_test.rb index 924ffb7..9b66745 100644 --- a/test/server/runner_test.rb +++ b/test/server/runner_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/server' class PrometheusRunnerTest < Minitest::Test diff --git a/test/server/sidekiq_process_collector_test.rb b/test/server/sidekiq_process_collector_test.rb index d31e874..b31fa66 100644 --- a/test/server/sidekiq_process_collector_test.rb +++ b/test/server/sidekiq_process_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/sidekiq_queue_collector_test.rb b/test/server/sidekiq_queue_collector_test.rb index 28c80c1..18ecf5c 100644 --- a/test/server/sidekiq_queue_collector_test.rb +++ b/test/server/sidekiq_queue_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/unicorn_collector_test.rb b/test/server/unicorn_collector_test.rb index fb95d68..193de32 100644 --- a/test/server/unicorn_collector_test.rb +++ b/test/server/unicorn_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'mini_racer' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/web_collector_test.rb b/test/server/web_collector_test.rb index a17df4e..8c8a5e7 100644 --- a/test/server/web_collector_test.rb +++ b/test/server/web_collector_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'mini_racer' require 'prometheus_exporter/server' require 'prometheus_exporter/instrumentation' diff --git a/test/server/web_server_test.rb b/test/server/web_server_test.rb index b0f9d7b..35879cc 100644 --- a/test/server/web_server_test.rb +++ b/test/server/web_server_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'test_helper' +require_relative '../test_helper' require 'prometheus_exporter/server' require 'prometheus_exporter/client' require 'net/http' @@ -96,7 +96,8 @@ class PrometheusExporterTest < Minitest::Test def test_it_can_collect_over_ipv6 port = find_free_port - server = PrometheusExporter::Server::WebServer.new port: port + # for some reason on WSL it is not binding to v6 for localhost. + server = PrometheusExporter::Server::WebServer.new port: port, bind: "::1" collector = server.collector server.start