Commit 379260e
test: replace internals with public API
Remove instances where `--expose-internals` is used to gain access to
buffer.kStringMaxLength. The property is availalble without a flag. It
is undocumented but the same as the documented
`buffer.constants.MAX_STRING_LENGTH` so use that. (We even have a test
that confirms that they are the same value.)
PR-URL: #25309
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 2014eba commit 379260e
9 files changed
Lines changed: 10 additions & 27 deletions
File tree
- test
- addons/stringbytes-external-exceed-max
- sequential
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -12,7 +10,7 @@ const assert = require('assert'); | |||
| 12 | 10 | ||
| 13 | 11 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 14 | 12 | // v8::String::kMaxLength defined in v8.h | |
| 15 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 13 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 16 | 14 | ||
| 17 | 15 | let buf; | |
| 18 | 16 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); | |||
| 11 | 9 | ||
| 12 | 10 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 13 | 11 | // v8::String::kMaxLength defined in v8.h | |
| 14 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 12 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 15 | 13 | ||
| 16 | 14 | let buf; | |
| 17 | 15 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); | |||
| 11 | 9 | ||
| 12 | 10 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 13 | 11 | // v8::String::kMaxLength defined in v8.h | |
| 14 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 12 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 15 | 13 | ||
| 16 | 14 | let buf; | |
| 17 | 15 | try { | |
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,7 @@ | |||
| 1 | - // Flags: --expose-gc --expose-internals | ||
| 1 | + // Flags: --expose-gc | ||
| 2 | 2 | 'use strict'; | |
| 3 | 3 | ||
| 4 | 4 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 5 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 6 | if (!common.enoughTestMem) | |
| 8 | 7 | common.skip(skipMessage); | |
@@ -12,7 +11,7 @@ const assert = require('assert'); | |||
| 12 | 11 | ||
| 13 | 12 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 14 | 13 | // v8::String::kMaxLength defined in v8.h | |
| 15 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 14 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 16 | 15 | ||
| 17 | 16 | let buf; | |
| 18 | 17 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); | |||
| 11 | 9 | ||
| 12 | 10 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 13 | 11 | // v8::String::kMaxLength defined in v8.h | |
| 14 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 12 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 15 | 13 | ||
| 16 | 14 | let buf; | |
| 17 | 15 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -12,7 +10,7 @@ const assert = require('assert'); | |||
| 12 | 10 | ||
| 13 | 11 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 14 | 12 | // v8::String::kMaxLength defined in v8.h | |
| 15 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 13 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 16 | 14 | ||
| 17 | 15 | let buf; | |
| 18 | 16 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -12,7 +10,7 @@ const assert = require('assert'); | |||
| 12 | 10 | ||
| 13 | 11 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 14 | 12 | // v8::String::kMaxLength defined in v8.h | |
| 15 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 13 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 16 | 14 | ||
| 17 | 15 | let buf; | |
| 18 | 16 | try { | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | const skipMessage = 'intensive toString tests due to memory confinements'; | |
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip(skipMessage); | |
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); | |||
| 11 | 9 | ||
| 12 | 10 | // v8 fails silently if string length > v8::String::kMaxLength | |
| 13 | 11 | // v8::String::kMaxLength defined in v8.h | |
| 14 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 12 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 15 | 13 | ||
| 16 | 14 | let buf; | |
| 17 | 15 | try { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,6 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 3 | 2 | ||
| 4 | 3 | const common = require('../common'); | |
| 5 | - const { internalBinding } = require('internal/test/binding'); | ||
| 6 | 4 | ||
| 7 | 5 | if (!common.enoughTestMem) | |
| 8 | 6 | common.skip('intensive toString tests due to memory confinements'); | |
@@ -11,7 +9,7 @@ const assert = require('assert'); | |||
| 11 | 9 | const fs = require('fs'); | |
| 12 | 10 | const path = require('path'); | |
| 13 | 11 | const cp = require('child_process'); | |
| 14 | - const kStringMaxLength = internalBinding('buffer').kStringMaxLength; | ||
| 12 | + const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; | ||
| 15 | 13 | if (common.isAIX && (Number(cp.execSync('ulimit -f')) * 512) < kStringMaxLength) | |
| 16 | 14 | common.skip('intensive toString tests due to file size confinements'); | |
| 17 | 15 | ||
0 commit comments