test: Remove verify_peer helper

open-telemetry · Sep 12, 2024 · b2a3764 · b2a3764
1 parent a7280ab
commit b2a3764
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/exporter/otlp-logs/test/opentelemetry/exporter/otlp/logs_exporter_test.rb b/exporter/otlp-logs/test/opentelemetry/exporter/otlp/logs_exporter_test.rb
@@ -91,8 +91,6 @@
                                                 'OTEL_EXPORTER_OTLP_COMPRESSION' => 'gzip',
                                                 'OTEL_RUBY_EXPORTER_OTLP_SSL_VERIFY_NONE' => 'true',
                                                 'OTEL_EXPORTER_OTLP_TIMEOUT' => '11') do
-
-        remove_verify_peer_if_present
         OpenTelemetry::Exporter::OTLP::LogsExporter.new
       end
       _(exp.instance_variable_get(:@headers)).must_equal('a' => 'b', 'c' => 'd', 'User-Agent' => DEFAULT_USER_AGENT)
@@ -313,7 +311,7 @@
   describe 'ssl_verify_mode:' do
     it 'can be set to VERIFY_NONE by an envvar' do
       exp = OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_EXPORTER_OTLP_SSL_VERIFY_NONE' => 'true') do
-        remove_verify_peer_if_present
+        binding.irb
         OpenTelemetry::Exporter::OTLP::LogsExporter.new
       end
       http = exp.instance_variable_get(:@http)

diff --git a/exporter/otlp-logs/test/test_helper.rb b/exporter/otlp-logs/test/test_helper.rb
@@ -20,9 +20,3 @@
 require 'webmock/minitest'
 
 OpenTelemetry.logger = Logger.new(File::NULL)
-
-def remove_verify_peer_if_present
-  # The verify peer env var is checked first. if it is defined, verify none will never be set
-  # due to test order, sometimes it is defined in the ENV, so ensure it is not there
-  ENV.delete('OTEL_RUBY_EXPORTER_OTLP_SSL_VERIFY_PEER') if ENV.key?('OTEL_RUBY_EXPORTER_OTLP_SSL_VERIFY_PEER')
-end