diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 16:43:58 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 17:26:47 +0100 |
| commit | 94e147500c5bf457c9101bda8c8020d8ff896708 (patch) | |
| tree | 7cdea05267b4d7c118bab4902c8ccc76216128f3 /test/parallel/test-stream2-transform.js | |
| parent | 261706e2ef9f12131ddcf8ff40fd4c7823693e8d (diff) | |
| parent | 372a2f56bed341a23c435c5a94fbb77dbbd6c600 (diff) | |
| download | android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.tar.gz android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.tar.bz2 android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.zip | |
Merge remote-tracking branch 'joyent/v0.12' into v1.x
I was originally going to do this after the v0.11.15 release, but as
that release is three weeks overdue now, I decided not to wait any
longer; we don't want the delta to get too big.
Conflicts:
lib/net.js
test/simple/simple.status
PR-URL: https://github.com/iojs/io.js/pull/236
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'test/parallel/test-stream2-transform.js')
| -rw-r--r-- | test/parallel/test-stream2-transform.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/parallel/test-stream2-transform.js b/test/parallel/test-stream2-transform.js index 9c9ddd8efc..6064565be0 100644 --- a/test/parallel/test-stream2-transform.js +++ b/test/parallel/test-stream2-transform.js @@ -81,7 +81,7 @@ test('writable side consumption', function(t) { t.equal(tx._readableState.length, 10); t.equal(transformed, 10); t.equal(tx._transformState.writechunk.length, 5); - t.same(tx._writableState.buffer.map(function(c) { + t.same(tx._writableState.getBuffer().map(function(c) { return c.chunk.length; }), [6, 7, 8, 9, 10]); |