test/test_helper.rb | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 require mocha/setup instead of mocha in test helper
 API for mocha has changed slightly since these tests were 
 developed and this patch ensures the tests run correctly.

test/thread_error_handling_tests.rb | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 increase timeout a thread error handling test
 Increase hardcoded timeout to ensure test runs on a slow test
 system, for example a virtual machine.

test/test_helper.rb | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 fix ftbfs with ruby-mocha 2

metriks.gemspec | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

test/riemann_reporter_test.rb | 67 23 + 44 - 0 !
1 file changed, 23 insertions(+), 44 deletions(-)

 test: make riemannreportertest robust
 The test suite was using strict Mocha expectations on the exact hash
 passed to Riemann::Client#<<. However since riemann-client 1.2.x, the
 arguments received by the mock are affected by internal normalisation.