From ddfc22f305b7e6c56428518009202e910a63d60e Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 23 Jul 2015 11:28:16 -0700
Subject: [PATCH] Merge github.com:grpc/grpc into
 sometimes-its-good-just-to-check-in-with-each-other

---
 test/surface_test.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/surface_test.js b/test/surface_test.js
index 3cb68f8c..1dbe4e28 100644
--- a/test/surface_test.js
+++ b/test/surface_test.js
@@ -260,9 +260,8 @@ describe('Echo metadata', function() {
   });
   it('shows the correct user-agent string', function(done) {
     var version = require('../package.json').version;
-    var call = client.unary({}, function(err, data) {
-      assert.ifError(err);
-    }, {key: ['value']});
+    var call = client.unary({}, function(err, data) { assert.ifError(err); },
+                            {key: ['value']});
     call.on('metadata', function(metadata) {
       assert(_.startsWith(metadata['user-agent'], 'grpc-node/' + version));
       done();