newrelic_rpm 3.6.5.130 → 3.6.6.147

data/test/multiverse/script/run_one

@@ -1,3 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+require 'fileutils'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'multiverse', 'environment'))
 
-test/multiverse/lib/multiverse/suite.rb $PWD/test/multiverse/suites/$1 "$2" true
+Multiverse::Runner.run_one ARGV[0]

data/test/multiverse/script/runner

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-require 'test/unit'
-
-module Multiverse
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'multiverse', 'environment'))
-end
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'multiverse', 'environment'))
 
 Multiverse::Runner.run ARGV[0].to_s

data/test/multiverse/suites/active_record/Envfile

@@ -1,12 +1,13 @@
 gemfile <<-RB
+  gem 'rack'
   if RUBY_VERSION == '1.8.6'
     gem 'activerecord', '2.3.14'
   elsif RUBY_PLATFORM == 'java'
     gem 'activerecord-jdbcsqlite3-adapter', '1.2.2.1'
     gem 'jdbc-sqlite3', '3.7.2'
-    gem 'activerecord'
+    gem 'activerecord', '~> 3.2.0'
   else
-    gem 'activerecord'
+    gem 'activerecord', '~> 3.2.0'
     gem 'sqlite3', '~> 1.3.5'
   end
 RB

data/test/multiverse/suites/active_record/ar_method_aliasing.rb

@@ -2,18 +2,20 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-
 require 'rubygems'
 
 require 'active_record'
-require 'test/unit'
 require 'newrelic_rpm'
 require 'multiverse/color'
+require 'multiverse_helpers'
+require 'minitest/unit'
 
-
-class InstrumentActiveRecordMethods < Test::Unit::TestCase
+class InstrumentActiveRecordMethods < MiniTest::Unit::TestCase
   extend Multiverse::Color
 
+  include MultiverseHelpers
+  setup_and_teardown_agent
+
   if RUBY_VERSION >= '1.8.7'
     if RUBY_PLATFORM == 'java'
       require 'jdbc/sqlite3'
@@ -23,8 +25,8 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
       @@adapter = 'sqlite3'
     end
 
-    class User < ActiveRecord::Base 
-      include NewRelic::Agent::MethodTracer 
+    class User < ActiveRecord::Base
+      include NewRelic::Agent::MethodTracer
       has_many :aliases
 
       add_method_tracer :save!
@@ -38,8 +40,8 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
       add_method_tracer :persisted?
       add_method_tracer :destroyed?
     end
-    
-    def setup
+
+    def after_setup
       puts "adapter : #{@@adapter}"
       @db_connection = ActiveRecord::Base.establish_connection( :adapter => @@adapter, :database => "testdb.sqlite3")
       ActiveRecord::Migration.class_eval do
@@ -55,7 +57,7 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
       end
     end
 
-    def teardown
+    def after_teardown
       @db_connection = ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database => "testdb.sqlite3")
       ActiveRecord::Migration.class_eval do
         @connection = @db_connection
@@ -70,7 +72,7 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
       a_user.save!
       assert User.connected?
       assert a_user.persisted?
-      assert a_user.id == 1 
+      assert a_user.id == 1
     end
 
     def test_alias_collection_query_method
@@ -78,7 +80,7 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
       a_user.save!
       a_user = User.find(1)
       assert User.connected?
-      assert a_user.id = 1  
+      assert a_user.id = 1
 
       an_alias = Alias.new :user_id => a_user.id, :aka => "the Blob"
       assert an_alias.new_record?
@@ -95,4 +97,3 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
     puts yellow('SKIPPED! skipped until ruby 1.8.6 compatibilites ironed out')
   end
 end
-

data/test/multiverse/suites/active_record/config/newrelic.yml

@@ -11,12 +11,9 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_trace:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
-  log_file_path: agent.log

data/test/multiverse/suites/agent_only/audit_log_test.rb

@@ -4,25 +4,17 @@
 
 # RUBY-981 Audit Log
 
-require 'test/unit'
 require 'newrelic_rpm'
-require 'fake_collector'
+require 'multiverse_helpers'
 
-class AuditLogTest < Test::Unit::TestCase
-  # Initialization
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    $collector.run
+class AuditLogTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
 
+  def setup
     @string_log = StringIO.new
     NewRelic::Agent::AuditLogger.any_instance.stubs(:ensure_log_path).returns(@string_log)
   end
 
-  def teardown
-    $collector.reset
-  end
-
   def audit_log_contents
     if @contents.nil?
       @string_log.rewind
@@ -45,7 +37,7 @@ class AuditLogTest < Test::Unit::TestCase
   # request bodies for the audit log, the transformation into strings is
   # effectively one-way. This, combined with the fact that Hash traversal order
   # is arbitrary in Ruby 1.8.x means that it's difficult to directly assert that
-  # some object graph made it into the audit log (due to different possible 
+  # some object graph made it into the audit log (due to different possible
   # orderings of the key/value pairs in Hashes that were embedded in the request
   # body). So, this method traverses an object graph and only makes assertions
   # about the terminal (non-Array-or-Hash) nodes therein.
@@ -68,34 +60,38 @@ class AuditLogTest < Test::Unit::TestCase
     end
   end
 
-  def run_agent_with_options(options)
-    NewRelic::Agent.manual_start(options)
-    yield NewRelic::Agent.agent if block_given?
-    NewRelic::Agent.shutdown
-  end
-
   def test_logs_nothing_by_default
-    run_agent_with_options({})
-    assert_equal('', audit_log_contents)
+    run_agent do
+      perform_actions
+      assert_equal('', audit_log_contents)
+    end
   end
 
   def test_logs_nothing_when_disabled
-    run_agent_with_options({ :'audit_log.enabled' => false })
-    assert_equal('', audit_log_contents)
+    run_agent(:'audit_log.enabled' => false) do
+      perform_actions
+      assert_equal('', audit_log_contents)
+    end
   end
 
   def test_logs_request_bodies_human_readably_ish
-    format = NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? :json : :pruby
-    run_agent_with_options({ :'audit_log.enabled' => true }) do |agent|
-      agent.sql_sampler.notice_first_scope_push(nil)
-      agent.sql_sampler.notice_sql("select * from test",
-                                    "Database/test/select",
-                                    nil, 1.5)
-      agent.sql_sampler.notice_scope_empty('txn')
-      agent.send(:harvest_and_send_slowest_sql)
-    end
-    $collector.agent_data.each do |req|
-      assert_audit_log_contains_object(req.body, format)
+    run_agent(:'audit_log.enabled' => true) do
+      perform_actions
+      format = NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? :json : :pruby
+      $collector.agent_data.each do |req|
+        assert_audit_log_contains_object(req.body, format)
+      end
     end
   end
+
+  def perform_actions
+    reset_collector
+
+    NewRelic::Agent.instance.sql_sampler.notice_first_scope_push(nil)
+    NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
+                                 "Database/test/select",
+                                 nil, 1.5)
+    NewRelic::Agent.instance.sql_sampler.notice_scope_empty('txn')
+    NewRelic::Agent.instance.send(:harvest_and_send_slowest_sql)
+  end
 end

data/test/multiverse/suites/agent_only/before_suite.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'multiverse_helpers'
+
+MultiverseHelpers.setup_collector

data/test/multiverse/suites/agent_only/config/newrelic.yml

@@ -11,17 +11,11 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-<% if $collector && $collector.port %>
-  port: <%= $collector.port %>
-<% else %>
-  port: <%= 30_000 + ($$ % 10_000) %>
-<% end %>
+  port: <%= $collector && $collector.port %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
   capture_params: false
-  log_level: debug
-  log_file_path: agent.log
   browser_monitoring:
     auto_instrument: true

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -5,34 +5,27 @@
 require 'rack/test'
 require 'fake_collector'
 require './testing_app'
+require 'multiverse_helpers'
 
-class CrossProcessTest < Test::Unit::TestCase
+class CrossApplicationTracingTest < MiniTest::Unit::TestCase
 
   # Important because the hooks are global that we only wire one AgentHooks up
   @@app = TestingApp.new
   @@wrapper_app = NewRelic::Rack::AgentHooks.new(@@app)
 
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
-    $collector.run
-
-    NewRelic::Agent.manual_start(
-      :cross_process_id => "boo",
-      :encoding_key => "\0",
-      :trusted_account_ids => [1])
-
-    NewRelic::Agent.instance.events.notify(:finished_configuring) 
+  include MultiverseHelpers
+  setup_and_teardown_agent(:cross_process_id => "boo",
+                           :encoding_key => "\0",
+                           :trusted_account_ids => [1]) \
+  do |collector|
+    collector.stub('connect', {"agent_run_id" => 666 })
+  end
 
+  def after_setup
     @@app.reset_headers
     @@app.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
   end
 
-  def teardown
-    NewRelic::Agent.shutdown
-  end
-
   include Rack::Test::Methods
 
   def app
@@ -51,8 +44,7 @@ class CrossProcessTest < Test::Unit::TestCase
 
   def test_cross_app_writes_out_information
     get '/', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
-    assert_not_nil last_response.headers["X-NewRelic-App-Data"]
-    metric = NewRelic::Agent.instance.stats_engine.lookup_stats('ClientApplication/1#234/all')
-    assert_equal 1, metric.call_count
+    refute_nil last_response.headers["X-NewRelic-App-Data"]
+    assert_metrics_recorded(['ClientApplication/1#234/all'])
   end
 end

data/test/multiverse/suites/agent_only/http_response_code_test.rb

@@ -4,54 +4,36 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-765
 require 'fake_collector'
+require 'multiverse_helpers'
 
-class HttpResponseCodeTest < Test::Unit::TestCase
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    $collector.run
-    NewRelic::Agent.manual_start(:send_data_on_exit => false, :port => $collector.port)
-    @agent = NewRelic::Agent.instance
-  end
+class HttpResponseCodeTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
 
-  def teardown
-    $collector.reset
-    NewRelic::Agent.shutdown
-  end
+  setup_and_teardown_agent
 
   def test_request_entity_too_large
     $collector.mock['metric_data'] = [413, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'too much'}}]
 
-    @agent.stats_engine.get_stats_no_scope('Custom/too_big') \
-      .record_data_point(1)
-    assert_equal 1, @agent.stats_engine \
-      .get_stats_no_scope('Custom/too_big').call_count
+    NewRelic::Agent.increment_metric('Custom/too_big')
+    assert_metrics_recorded(['Custom/too_big'])
 
-    @agent.send(:harvest_and_send_timeslice_data)
+    agent.send(:harvest_and_send_timeslice_data)
 
-    # make sure the data gets thrown away without crashing
-    assert_equal 0, @agent.stats_engine \
-      .get_stats_no_scope('Custom/too_big').call_count
-
-    # make sure we actually talked to the collector
-    assert_equal(1, $collector.agent_data.select{|x| x.action == 'metric_data'}.size)
+    # make sure the data gets thrown away after we called collector without crashing
+    assert_metrics_not_recorded(['Custom/too_big'])
+    assert_equal(1, $collector.calls_for('metric_data').size)
   end
 
   def test_unsupported_media_type
     $collector.mock['metric_data'] = [415, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'looks bad'}}]
 
-    @agent.stats_engine.get_stats_no_scope('Custom/too_big') \
-      .record_data_point(1)
-    assert_equal 1, @agent.stats_engine \
-      .get_stats_no_scope('Custom/too_big').call_count
-
-    @agent.send(:harvest_and_send_timeslice_data)
+    NewRelic::Agent.increment_metric('Custom/too_big')
+    assert_metrics_recorded(['Custom/too_big'])
 
-    # make sure the data gets thrown away without crashing
-    assert_equal 0, @agent.stats_engine \
-      .get_stats_no_scope('Custom/too_big').call_count
+    agent.send(:harvest_and_send_timeslice_data)
 
-    # make sure we actually talked to the collector
-    assert_equal(1, $collector.agent_data.select{|x| x.action == 'metric_data'}.size)
+    # make sure the data gets thrown away after we called collector without crashing
+    assert_metrics_not_recorded(['Custom/too_big'])
+    assert_equal(1, $collector.calls_for('metric_data').size)
   end
 end

data/test/multiverse/suites/agent_only/key_transactions_test.rb

@@ -3,8 +3,25 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+require 'multiverse_helpers'
+
+class KeyTransactionsTest < MiniTest::Unit::TestCase
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent do |collector|
+    key_txn_name = 'Controller/KeyTransactionsTest::TestWidget/key_txn'
+    collector.stub('connect',
+                   {
+      'web_transactions_apdex' => { key_txn_name => 1 },
+      'apdex_t' => 10
+    })
+  end
+
+  def after_setup
+    freeze_time
+  end
 
-class KeyTransactionsTest < Test::Unit::TestCase
   class TestWidget
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
@@ -19,28 +36,6 @@ class KeyTransactionsTest < Test::Unit::TestCase
     add_transaction_tracer :other_txn
   end
 
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    key_apdex_config = { 'Controller/KeyTransactionsTest::TestWidget/key_txn' => 1 }
-    $collector.mock['connect'] = [200, {'return_value' => {
-                                      "agent_run_id" => 666,
-                            'web_transactions_apdex' => key_apdex_config,
-                                           'apdex_t' => 10
-                                    }}]
-    $collector.run
-
-    NewRelic::Agent.manual_start(:sync_startup => true,
-                                 :force_reconnect => true)
-
-    freeze_time
-  end
-
-  def teardown
-    NewRelic::Agent.shutdown
-    $collector.reset
-  end
-
   SATISFYING = 0
   TOLERATING = 1
   FAILING    = 2
@@ -75,9 +70,4 @@ class KeyTransactionsTest < Test::Unit::TestCase
                  traces[0].metric_name)
   end
 
-  def stub_time_now
-    now = Time.now
-    Time.stubs(:now).returns(now)
-    return now
-  end
 end