spanner: fix stream destroy bug

callmehiphop · callmehiphop · commit 8469a50b05c2 · 2017-06-05T14:42:46.000-04:00
diff --git a/packages/spanner/src/transaction.js b/packages/spanner/src/transaction.js
@@ -371,7 +371,7 @@ Transaction.prototype.requestStream = function(config) {
       return;
     }
 
-    requestStream.destroy();
+    requestStream.end();
     userStream.destroy();
 
     if (self.shouldRetry_(err)) {
diff --git a/packages/spanner/test/transaction.js b/packages/spanner/test/transaction.js
@@ -612,6 +612,14 @@ describe('Transaction', function() {
         var error = { code: 10 };
         var stream;
 
+        var end = fakeStream.end;
+        var ended = false;
+
+        fakeStream.end = function() {
+          ended = true;
+          return end.call(fakeStream);
+        };
+
         transaction.shouldRetry_ = function(err) {
           assert.strictEqual(err, error);
           return true;
@@ -620,7 +628,7 @@ describe('Transaction', function() {
         transaction.runFn_ = done; // should not be called
 
         transaction.retry_ = function() {
-          assert(fakeStream._destroyed);
+          assert(ended);
           assert(stream._destroyed);
           done();
         };
@@ -635,6 +643,14 @@ describe('Transaction', function() {
         var error = { code: 10 };
         var stream;
 
+        var end = fakeStream.end;
+        var ended = false;
+
+        fakeStream.end = function() {
+          ended = true;
+          return end.call(fakeStream);
+        };
+
         var deadlineError = {};
         var createDeadlineError = Transaction.createDeadlineError_;
 
@@ -652,7 +668,7 @@ describe('Transaction', function() {
 
         transaction.runFn_ = function(err) {
           assert.strictEqual(err, deadlineError);
-          assert(fakeStream._destroyed);
+          assert(ended);
           assert(stream._destroyed);
 
           Transaction.createDeadlineError_ = createDeadlineError;

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ Transaction.prototype.requestStream = function(config) {`
`371`	`371`	`return;`
`372`	`372`	`}`
`373`	`373`
`374`		`- requestStream.destroy();`
	`374`	`+ requestStream.end();`
`375`	`375`	`userStream.destroy();`
`376`	`376`
`377`	`377`	`if (self.shouldRetry_(err)) {`