test_helper.rb in newrelic_rpm-3.6.9.171

- old
+ new

@@ -13,10 +13,14 @@
 $LOAD_PATH.uniq!
 
 require 'rubygems'
 require 'rake'
 
+Dir.glob(File.join(NEWRELIC_PLUGIN_DIR,'test/helpers/*.rb')).each do |helper|
+  require helper
+end
+
 # We can speed things up in tests that don't need to load rails.
 # You can also run the tests in a mode without rails.  Many tests
 # will be skipped.
 if ENV["NO_RAILS"]
   puts "Running tests in standalone mode without Rails."
@@ -146,9 +150,10 @@
 def fixture_tcp_socket( response )
   # Don't actually talk to Google.
   socket = stub("socket") do
     stubs(:closed?).returns(false)
     stubs(:close)
+    stubs(:setsockopt)
 
     # Simulate a bunch of socket-ey stuff since Mocha doesn't really
     # provide any other way to do it
     class << self
       attr_accessor :response, :write_checker