Add changes missed from merge.

We were merging release to dev to update our SHAs that got thrown off from a couple backports in the previous release. When resolving those conflicts, we missed these two changes.
newrelic · Jan 13, 2016 · 88511b9 · 88511b9
1 parent 66d2b8b
commit 88511b9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/test/multiverse/suites/agent_only/error_events_test.rb b/test/multiverse/suites/agent_only/error_events_test.rb
@@ -86,18 +86,6 @@ def test_error_events_created_outside_of_transaction
     assert_equal "No Txn", intrinsics["error.message"]
   end
 
-  def test_error_events_created_outside_of_transaction
-    NewRelic::Agent.notice_error RuntimeError.new "No Txn"
-    NewRelic::Agent.agent.send(:harvest_and_send_error_event_data)
-
-    intrinsics, _, _ = last_error_event
-
-    assert_equal "TransactionError", intrinsics["type"]
-    assert_in_delta Time.now.to_f, intrinsics["timestamp"], 0.001
-    assert_equal "RuntimeError", intrinsics["error.class"]
-    assert_equal "No Txn", intrinsics["error.message"]
-  end
-
   def generate_errors num_errors = 1
     in_transaction :transaction_name => "Controller/blogs/index" do |t|
       num_errors.times { t.notice_error RuntimeError.new "Big Controller" }

diff --git a/test/new_relic/marshalling_test_cases.rb b/test/new_relic/marshalling_test_cases.rb
@@ -119,7 +119,7 @@ def test_sends_error_events
     result = $collector.calls_for('error_event_data')
 
     assert_equal 1, result.length
-    events = result.first.error_events
+    events = result.first.events
     assert_equal 1, events.length
 
     expected_event = [