RubyGems - newrelic_rpm - Versions diffs - 3.7.1.188 → 3.7.2.190.beta - Mend

newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

Files changed (209) hide show

data/test/multiverse/suites/typhoeus/Envfile CHANGED Viewed

@@ -10,7 +10,7 @@ suite_condition("Typhoeus not supported in 1.8.6 and excluded on 1.8.7 non-REE")
 end
 gemfile <<-RB
-  gem 'typhoeus', '~> 0.6.3'
+  gem 'typhoeus', '~> 0.6.5'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/multiverse/suites/typhoeus/typhoeus_test.rb CHANGED Viewed

@@ -13,10 +13,16 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
   class TyphoeusTest < MiniTest::Unit::TestCase
     include HttpClientTestCases
-    USE_SSL_VERIFYPEER_VERSION = NewRelic::VersionNumber.new("0.5.0")
+    USE_SSL_VERIFYPEER_VERSION  = NewRelic::VersionNumber.new("0.5.0")
+    # Starting in version 0.6.4, Typhoeus supports passing URI instances instead
+    # of String URLs. Make sure we don't break that.
+    SUPPORTS_URI_OBJECT_VERSION = NewRelic::VersionNumber.new("0.6.4")
+    CURRENT_TYPHOEUS_VERSION = NewRelic::VersionNumber.new(Typhoeus::VERSION)
     def ssl_option
-      if NewRelic::VersionNumber.new(Typhoeus::VERSION) >= USE_SSL_VERIFYPEER_VERSION
+      if CURRENT_TYPHOEUS_VERSION >= USE_SSL_VERIFYPEER_VERSION
         { :ssl_verifypeer => false }
       else
         { :disable_ssl_peer_verification => true }
@@ -73,6 +79,14 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
         assert_equal "External/Multiple/Typhoeus::Hydra/run", last_segment.metric_name
       end
     end
+    if CURRENT_TYPHOEUS_VERSION >= SUPPORTS_URI_OBJECT_VERSION
+      def test_get_with_uri
+        res = get_response(default_uri)
+        assert_match %r/<head>/i, body(res)
+        assert_externals_recorded_for("localhost", "GET")
+      end
+    end
   end
 else

data/test/multiverse/test/multiverse_test.rb CHANGED Viewed

@@ -47,13 +47,13 @@ class MultiverseTest < Test::Unit::TestCase
   def test_failed_tests_mean_unsuccessful_exit_code_in_parent_with_fork_execute_mode
     run = run_suite('two')
-    assert_not_equal 0, run.exit_status, "Failed test should mean unsucessful " <<
+    refute_equal 0, run.exit_status, "Failed test should mean unsucessful " <<
                                          "exit status in parent \n" # + run.output
   end
   def test_failed_tests_mean_unsucessful_exit_code_in_parent_with_spawn_execute_mode
     run = run_suite('three')
-    assert_not_equal 0, run.exit_status, "Failed test in spawn mode should mean unsucessful " <<
+    refute_equal 0, run.exit_status, "Failed test in spawn mode should mean unsucessful " <<
                                          "exit status in parent \n" # + run.output
   end
 end

data/test/new_relic/agent/agent/connect_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', '..','test
 require 'new_relic/agent/agent'
 require 'ostruct'
-class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
+class NewRelic::Agent::Agent::ConnectTest < MiniTest::Unit::TestCase
   include NewRelic::Agent::Agent::Connect
   include TransactionSampleTestHelper

data/test/new_relic/agent/agent/start_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
-class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
+class NewRelic::Agent::Agent::StartTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::Start

data/test/new_relic/agent/agent/start_worker_thread_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
-class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
+class NewRelic::Agent::Agent::StartWorkerThreadTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::StartWorkerThread

data/test/new_relic/agent/agent_logger_test.rb CHANGED Viewed

@@ -20,7 +20,7 @@ class ArrayLogDevice
 end
-class AgentLoggerTest < Test::Unit::TestCase
+class AgentLoggerTest < MiniTest::Unit::TestCase
   LEVELS = [:fatal, :error, :warn, :info, :debug]
@@ -91,9 +91,7 @@ class AgentLoggerTest < Test::Unit::TestCase
   def test_wont_log_if_agent_not_enabled
     with_config(:agent_enabled => false) do
       logger = NewRelic::Agent::AgentLogger.new
-      assert_nothing_raised do
-        logger.warn('hi there')
-      end
+      logger.warn('hi there')
       assert_kind_of NewRelic::Agent::NullLogger, logger.instance_variable_get( :@log )
     end
@@ -250,9 +248,7 @@ class AgentLoggerTest < Test::Unit::TestCase
     logger = NewRelic::Agent::AgentLogger.new
     with_config(:agent_enabled => false) do
-      assert_nothing_raised do
-        logger.debug('hi!')
-      end
+      logger.debug('hi!')
     end
   ensure
     Kernel.module_eval do

data/test/new_relic/agent/agent_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 module NewRelic
   module Agent
-    class AgentTest < Test::Unit::TestCase
+    class AgentTest < MiniTest::Unit::TestCase
       include NewRelic::TestHelpers::Exceptions
       def setup
@@ -115,9 +115,7 @@ module NewRelic
         @agent.service.stubs(:transaction_sample_data).raises("wat")
         @agent.transaction_sampler.expects(:merge!).with(traces)
-        assert_nothing_raised do
-          @agent.send :harvest_and_send_transaction_traces
-        end
+        @agent.send :harvest_and_send_transaction_traces
       end
       def test_harvest_and_send_errors_merges_back_on_failure
@@ -127,9 +125,7 @@ module NewRelic
         @agent.service.stubs(:error_data).raises('wat')
         @agent.error_collector.expects(:merge!).with(errors)
-        assert_nothing_raised do
-          @agent.send :harvest_and_send_errors
-        end
+        @agent.send :harvest_and_send_errors
       end
       # This test asserts nothing about correctness of logging data from multiple
@@ -142,20 +138,18 @@ module NewRelic
         nthreads = 10
         nmetrics = 100
-        assert_nothing_raised do
-          nthreads.times do |tid|
-            t = Thread.new do
-              nmetrics.times do |mid|
-                @agent.stats_engine.get_stats("m#{mid}").record_data_point(1)
-              end
+        nthreads.times do |tid|
+          t = Thread.new do
+            nmetrics.times do |mid|
+              @agent.stats_engine.get_stats("m#{mid}").record_data_point(1)
             end
-            t.abort_on_exception = true
-            threads << t
           end
-          100.times { @agent.send(:harvest_and_send_timeslice_data) }
-          threads.each { |t| t.join }
+          t.abort_on_exception = true
+          threads << t
         end
+        100.times { @agent.send(:harvest_and_send_timeslice_data) }
+        threads.each { |t| t.join }
       end
       def test_handle_for_agent_commands
@@ -165,9 +159,7 @@ module NewRelic
       def test_check_for_and_handle_agent_commands_with_error
         @agent.service.expects(:get_agent_commands).raises('bad news')
-        assert_nothing_raised do
-          @agent.send :check_for_and_handle_agent_commands
-        end
+        @agent.send :check_for_and_handle_agent_commands
       end
       def test_harvest_and_send_for_agent_commands
@@ -226,9 +218,7 @@ module NewRelic
         @agent.service.stubs(:metric_data).raises('wat')
         @agent.stats_engine.expects(:merge!).with(timeslices)
-        assert_nothing_raised do
-          @agent.send(:harvest_and_send_timeslice_data)
-        end
+        @agent.send(:harvest_and_send_timeslice_data)
       end
       def test_connect_retries_on_timeout
@@ -365,32 +355,7 @@ module NewRelic
         @agent.send(:harvest_from_container, container, 'digglewumpus')
       end
-      def send_data_from_container
-        service = @agent.service
-        items = [1, 2, 3]
-        service.expects(:dummy_endpoint).with(items)
-        @agent.send(:send_data_from_container, stub, 'dummy_endpoint', items)
-      end
-      def send_data_from_container_with_unrecoverable_server_error
-        service = @agent.service
-        container = mock('data container')
-        container.expects(:merge!).never
-        items = [1, 2, 3]
-        service.expects(:dummy_endpoint).raises(UnrecoverableServerException)
-        @agent.send(:send_data_from_container, container, 'dummy_endpoint', items)
-      end
-      def send_data_from_container_with_other_error
-        service = @agent.service
-        items = [1, 2, 3]
-        container = mock('data container')
-        container.expects(:merge!).with(items)
-        service.expects(:dummy_endpoint).raises('other errors')
-        @agent.send(:send_data_from_container, container, 'dummy_endpoint', items)
-      end
-      def harvest_and_send_from_container
+      def test_harvest_and_send_from_container
         container = mock('data container')
         items = [1, 2, 3]
         container.expects(:harvest!).returns(items)
@@ -399,7 +364,7 @@ module NewRelic
         @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
       end
-      def harvest_and_send_from_container_does_not_harvest_if_nothing_to_send
+      def test_harvest_and_send_from_container_does_not_harvest_if_nothing_to_send
         container = mock('data container')
         items = []
         container.expects(:harvest!).returns(items)
@@ -408,7 +373,7 @@ module NewRelic
         @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
       end
-      def harvest_and_send_from_container_resets_on_harvest_failure
+      def test_harvest_and_send_from_container_resets_on_harvest_failure
         container = mock('data container')
         container.stubs(:harvest!).raises('an error')
         container.expects(:reset!)
@@ -416,7 +381,15 @@ module NewRelic
         @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
       end
-      def harvest_and_send_from_container_does_not_merge_on_unrecoverable_failure
+      def test_harvest_and_send_from_container_does_not_merge_on_serialization_failure
+        container = mock('data container')
+        container.stubs(:harvest!).returns([1,2,3])
+        @agent.service.stubs(:dummy_endpoint).raises(SerializationError)
+        container.expects(:merge!).never
+        @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
+      end
+      def test_harvest_and_send_from_container_does_not_merge_on_unrecoverable_failure
         container = mock('data container')
         container.stubs(:harvest!).returns([1,2,3])
         @agent.service.expects(:dummy_endpoint).with([1,2,3]).raises(UnrecoverableServerException)
@@ -424,7 +397,7 @@ module NewRelic
         @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
       end
-      def harvest_and_send_from_container_merges_on_other_failure
+      def test_harvest_and_send_from_container_merges_on_other_failure
         container = mock('data container')
         container.stubs(:harvest!).returns([1,2,3])
         @agent.service.expects(:dummy_endpoint).with([1,2,3]).raises('other error')
@@ -443,7 +416,7 @@ module NewRelic
         error_classes.each do |cls|
           @agent.service.expects(:dummy_endpoint).with([1]).raises(cls.new)
-          assert_raise(cls) do
+          assert_raises(cls) do
             @agent.send(:harvest_and_send_from_container, container, 'dummy_endpoint')
           end
         end
@@ -457,7 +430,7 @@ module NewRelic
         error_classes.each do |cls|
           @agent.service.expects(:get_agent_commands).raises(cls.new)
-          assert_raise(cls) do
+          assert_raises(cls) do
             @agent.send(:check_for_and_handle_agent_commands)
           end
         end
@@ -523,6 +496,9 @@ module NewRelic
       end
       def test_revert_to_default_configuration_removes_manual_and_server_source
+        manual_source = NewRelic::Agent::Configuration::ManualSource.new(:manual => "source")
+        Agent.config.apply_config(manual_source)
         server_config = NewRelic::Agent::Configuration::ServerSource.new({})
         Agent.config.apply_config(server_config, 1)
@@ -539,7 +515,7 @@ module NewRelic
       end
     end
-    class AgentStartingTest < Test::Unit::TestCase
+    class AgentStartingTest < MiniTest::Unit::TestCase
       def test_no_service_if_not_monitoring
         with_config(:monitor_mode => false) do
           agent = NewRelic::Agent::Agent.new

data/test/new_relic/agent/apdex_from_server_test.rb CHANGED Viewed

@@ -4,7 +4,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
-class NewRelic::Agent::ApdexFromServerTest < Test::Unit::TestCase
+class NewRelic::Agent::ApdexFromServerTest < MiniTest::Unit::TestCase
   def test_true
     # we need tests in this file - TBD

data/test/new_relic/agent/audit_logger_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/audit_logger'
 require 'new_relic/agent/null_logger'
-class AuditLoggerTest < Test::Unit::TestCase
+class AuditLoggerTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent.config.apply_config(:'audit_log.enabled' => true)
@@ -73,10 +73,9 @@ class AuditLoggerTest < Test::Unit::TestCase
     NewRelic::Agent::NullLogger.expects(:new).returns(null_logger)
     logger = NewRelic::Agent::AuditLogger.new
     logger.stubs(:ensure_log_path).returns(nil)
-    assert_nothing_raised do
-      logger.setup_logger
-      logger.log_request(@uri, 'whatever', @marshaller)
-    end
+    logger.setup_logger
+    logger.log_request(@uri, 'whatever', @marshaller)
   end
   def test_log_request_captures_system_call_errors
@@ -90,9 +89,7 @@ class AuditLoggerTest < Test::Unit::TestCase
     # This just silences that output to keep the test output uncluttered.
     Logger::LogDevice.any_instance.stubs(:warn)
-    assert_nothing_raised do
-      logger.log_request(@uri, 'whatever', @marshaller)
-    end
+    logger.log_request(@uri, 'whatever', @marshaller)
   end
   def test_prepares_data_with_identity_encoder

data/test/new_relic/agent/autostart_test.rb CHANGED Viewed

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/autostart'
-class AutostartTest < Test::Unit::TestCase
+class AutostartTest < MiniTest::Unit::TestCase
   def test_typically_the_agent_should_autostart
     assert ::NewRelic::Agent::Autostart.agent_should_start?

data/test/new_relic/agent/browser_token_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/browser_token'
 module NewRelic::Agent
-  class BrowserTokenTest < Test::Unit::TestCase
+  class BrowserTokenTest < MiniTest::Unit::TestCase
     def assert_token(expected, cookies)
       request = stub(:cookies => cookies)
       assert_equal(expected, BrowserToken.get_token(request))

data/test/new_relic/agent/busy_calculator_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
-class NewRelic::Agent::BusyCalculatorTest < Test::Unit::TestCase
+class NewRelic::Agent::BusyCalculatorTest < MiniTest::Unit::TestCase
   attr_reader :now
   def setup
     @now = Time.now.to_f
@@ -92,9 +92,7 @@ class NewRelic::Agent::BusyCalculatorTest < Test::Unit::TestCase
   def test_finishing_without_starting_doesnt_raise
     NewRelic::Agent::TransactionState.clear
-    assert_nothing_raised do
-      NewRelic::Agent::BusyCalculator.dispatcher_finish
-    end
+    NewRelic::Agent::BusyCalculator.dispatcher_finish
   end
 end

data/test/new_relic/agent/commands/agent_command_router_test.rb CHANGED Viewed

@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','data_contai
 require 'new_relic/agent/commands/agent_command_router'
 require 'new_relic/agent/commands/xray_session'
-class AgentCommandRouterTest < Test::Unit::TestCase
+class AgentCommandRouterTest < MiniTest::Unit::TestCase
   DEFAULT_ARGS = {
     "profile_id" => 42
@@ -147,7 +147,7 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       advance_time(1.1)
       result = agent_commands.harvest!
-      assert_not_empty result
+      refute_empty result
     end
     def test_can_stop_multiple_times_safely
@@ -157,7 +157,7 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       agent_commands.thread_profiler_session.stop(true)
       result = agent_commands.harvest!
-      assert_not_empty result
+      refute_empty result
     end
     def test_transmits_after_forced_stop
@@ -166,7 +166,7 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       agent_commands.thread_profiler_session.stop(true)
       result = agent_commands.harvest!
-      assert_not_empty result
+      refute_empty result
     end
     def test_harvest_following_before_shutdown_with_no_profile
@@ -180,7 +180,7 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       @events.notify(:before_shutdown)
       result = agent_commands.harvest!
-      assert_not_empty result
+      refute_empty result
     end
     def test_harvest_with_xray_sessions_in_progress

data/test/new_relic/agent/commands/agent_command_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/commands/agent_command'
 module NewRelic::Agent::Commands
-  class AgentCommandTest < Test::Unit::TestCase
+  class AgentCommandTest < MiniTest::Unit::TestCase
     ID = 123
     NAME = 'nuke_it_from_orbit'
     ARGUMENTS = { "profile_id" => 42 }