[v8.x] test: bump test/common to master#14459
[v8.x] test: bump test/common to master#14459addaleax wants to merge 3 commits intonodejs:v8.x-stagingfrom
Conversation
PR-URL: nodejs#14011 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
```
git checkout master test/common && \
git commit -m 'test: bump test/common to master'
```
| type: assert.AssertionError, | ||
| operator: undefined, | ||
| actual: undefined, | ||
| actual: 'custom message', |
There was a problem hiding this comment.
It is not accompanied by any changes to lib or src, so it really can’t be. I have to admit I didn’t really figure out why this is required, if you like, feel free to do the digging.
There was a problem hiding this comment.
I remember now. Before this change expectsError only checked ['message', 'type','code'] now it compares name if provided. And for AssertionError also ['generatedMessage', 'actual', 'expected', 'operator']
There was a problem hiding this comment.
Okay, so it sounds like everything is working as expected and better than before? :)
| }, common.expectsError({ | ||
| code: 'ERR_ASSERTION', | ||
| message: /^.+ is not the expected type \S/ | ||
| message: /^.+ is not instance of \S/ |
There was a problem hiding this comment.
This is not semver-major since it's a change in expectsError
Backport-PR-URL: nodejs#14459 Backport-Reviewed-By: Refael Ackermann <refack@gmail.com> PR-URL: nodejs#14011 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
```
git checkout master test/common && \
git commit -m 'test: bump test/common to master'
```
PR-URL: nodejs#14459
Reviewed-By: Refael Ackermann <refack@gmail.com>
PR-URL: nodejs#14459 Reviewed-By: Refael Ackermann <refack@gmail.com>
|
should this be backported? |
|
ping @addaleax |
|
No, I don’t think this really can be backported. If we want, we can bump |
Backport one commit from #14011, perform a full copy of
test/commonto what’s inmasterand fix up tests accordingly (with the solutions that were used onmaster, too).This is not pretty, but right now it seems like the most feasible solution to avoid future merge conflicts.
/cc @refack @BridgeAR