From 10aee10c0c94f6927aad74d1c5126fcb4a7ff36e Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 15 Jun 2017 13:29:30 +0200 Subject: [PATCH] test: check zlib version for createDeflateRaw We are currenly builing Node with --shared-zlib which happens to be version 1.2.8. The test for zlib.createDeflateRaw is expected to fail but does not when using version 1.2.8. As far as I can tell the fix referred to in the comments was introduced in version 1.2.9: - Reject a window size of 256 bytes if not using the zlib wrapper This commit suggests adding a check for the version and skipping this assert if the version is less than 1.2.9. Refs: http://zlib.net/ChangeLog.txt PR-URL: https://github.com/nodejs/node/pull/13697 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Anna Henningsen Reviewed-By: Richard Lau --- test/parallel/test-zlib-failed-init.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-zlib-failed-init.js b/test/parallel/test-zlib-failed-init.js index 3b6da1d4fb840f..4f224ecd616ec7 100644 --- a/test/parallel/test-zlib-failed-init.js +++ b/test/parallel/test-zlib-failed-init.js @@ -6,11 +6,15 @@ const assert = require('assert'); const zlib = require('zlib'); // For raw deflate encoding, requests for 256-byte windows are rejected as -// invalid by zlib. -// (http://zlib.net/manual.html#Advanced) -assert.throws(() => { - zlib.createDeflateRaw({ windowBits: 8 }); -}, /^Error: Init error$/); +// invalid by zlib (http://zlib.net/manual.html#Advanced). +// This check was introduced in version 1.2.9 and prior to that there was +// no such rejection which is the reason for the version check below +// (http://zlib.net/ChangeLog.txt). +if (!/^1\.2\.[0-8]$/.test(process.versions.zlib)) { + assert.throws(() => { + zlib.createDeflateRaw({ windowBits: 8 }); + }, /^Error: Init error$/); +} // Regression tests for bugs in the validation logic.