Skip to content

Commit

Permalink
Prefer JSX in ReactNoop assertions (to combat out-of-memory test runs) (
Browse files Browse the repository at this point in the history
#26127)

## Summary

Prefer `getChildrenAsJSX` or `toMatchRenderedOutput` over `getChildren`.
Use `dangerouslyGetChildren` if you really need to (e.g. for `toBe`
assertions).

Prefer `getPendingChildrenAsJSX` over `getPendingChildren`. Use
`dangerouslyGetPendingChildren` if you really need to (e.g. for `toBe`
assertions).

`ReactNoop.getChildren` contains the fibers as non-enumerable
properties. If you pass the children to `toEqual` and have a mismatch,
Jest performance is very poor (to the point of causing out-of-memory
crashes e.g.
https://app.circleci.com/pipelines/github/facebook/react/38084/workflows/02ca0cbb-bab4-4c19-8d7d-ada814eeebb9/jobs/624297/parallel-runs/5?filterBy=ALL&invite=true#step-106-27).
Mismatches can sometimes be intended e.g. on gated tests.

Instead, I converted almost all of the `toEqual` assertions to
`toMatchRenderedOutput` assertions or compare the JSX instead. For
ReactNoopPersistent we still use `getChildren` since we have assertions
on referential equality. `toMatchRenderedOutput` is more accurate in
some instances anyway. I highlighted some of those more accurate
assertions in review-comments.

## How did you test this change?

- [x] `CIRCLE_NODE_TOTAL=20 CIRCLE_NODE_INDEX=5 yarn test
-r=experimental --env=development --ci`: Can take up to 350s (and use up
to 7GB of memory) on `main` but 11s on this branch
- [x] No more slow `yarn test` parallel runs of `yarn_test` jobs (the
steps in these runs should take <1min but sometimes they take 3min and
end with OOM like
https://app.circleci.com/pipelines/github/facebook/react/38084/workflows/02ca0cbb-bab4-4c19-8d7d-ada814eeebb9/jobs/624258/parallel-runs/5?filterBy=ALL:
Looks good with a sample size of 1
https://app.circleci.com/pipelines/github/facebook/react/38110/workflows/745109a2-b86b-429f-8c01-9b23a245417a/jobs/624651

DiffTrain build for [3ff1540](3ff1540)
[View git log for this commit](https:/facebook/react/commits/3ff1540e9bbe30aae52e2c9ab61c843bd0c94237)
  • Loading branch information
sammy-SC committed Feb 9, 2023
1 parent cbbf551 commit a206fbd
Show file tree
Hide file tree
Showing 28 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78d2e9e2a894a7ea9aa3f9faadfc4c6038e86a75
3ff1540e9bbe30aae52e2c9ab61c843bd0c94237
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION_TRANSFORMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78d2e9e2a894a7ea9aa3f9faadfc4c6038e86a75
3ff1540e9bbe30aae52e2c9ab61c843bd0c94237
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

// ATTENTION
// When adding new symbols to this file,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

// ATTENTION
// When adding new symbols to this file,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,4 +646,4 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-78d2e9e2a-20230208";
exports.version = "18.3.0-www-classic-3ff1540e9-20230209";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -638,4 +638,4 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-78d2e9e2a-20230208";
exports.version = "18.3.0-www-modern-3ff1540e9-20230209";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-78d2e9e2a-20230208";
exports.version = "18.3.0-www-classic-3ff1540e9-20230209";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-78d2e9e2a-20230208";
exports.version = "18.3.0-www-modern-3ff1540e9-20230209";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -9845,7 +9845,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-classic-78d2e9e2a-20230208",
version: "18.3.0-www-classic-3ff1540e9-20230209",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1318 = {
Expand Down Expand Up @@ -9876,7 +9876,7 @@ var internals$jscomp$inline_1318 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -9510,7 +9510,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-modern-78d2e9e2a-20230208",
version: "18.3.0-www-modern-3ff1540e9-20230209",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1309 = {
Expand Down Expand Up @@ -9541,7 +9541,7 @@ var internals$jscomp$inline_1309 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -42695,7 +42695,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

function createPortal(
children,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -42419,7 +42419,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

function createPortal(
children,
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -15575,7 +15575,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1750 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-78d2e9e2a-20230208",
version: "18.3.0-www-classic-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2134 = {
Expand Down Expand Up @@ -15605,7 +15605,7 @@ var internals$jscomp$inline_2134 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2135 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15853,4 +15853,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -15136,7 +15136,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1718 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-78d2e9e2a-20230208",
version: "18.3.0-www-modern-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2109 = {
Expand Down Expand Up @@ -15167,7 +15167,7 @@ var internals$jscomp$inline_2109 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2110 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15355,4 +15355,4 @@ exports.unstable_flushControlled = function (fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -16345,7 +16345,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1824 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-78d2e9e2a-20230208",
version: "18.3.0-www-classic-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -16389,7 +16389,7 @@ var devToolsConfig$jscomp$inline_1824 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
});
assign(Internals, {
ReactBrowserEventEmitter: {
Expand Down Expand Up @@ -16624,7 +16624,7 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -15896,7 +15896,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1792 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-78d2e9e2a-20230208",
version: "18.3.0-www-modern-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -15941,7 +15941,7 @@ var devToolsConfig$jscomp$inline_1792 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
exports.createPortal = function (children, container) {
Expand Down Expand Up @@ -16116,7 +16116,7 @@ exports.unstable_flushControlled = function (fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3634,4 +3634,4 @@ exports.renderToString = function (children, options) {
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
);
};
exports.version = "18.3.0-www-classic-78d2e9e2a-20230208";
exports.version = "18.3.0-www-classic-3ff1540e9-20230209";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -3548,4 +3548,4 @@ exports.renderToString = function (children, options) {
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
);
};
exports.version = "18.3.0-www-modern-78d2e9e2a-20230208";
exports.version = "18.3.0-www-modern-3ff1540e9-20230209";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMTesting-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -31212,7 +31212,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

function createPortal(
children,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMTesting-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -38514,7 +38514,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

function createPortal(
children,
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOMTesting-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -11356,7 +11356,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1518 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-78d2e9e2a-20230208",
version: "18.3.0-www-classic-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2047 = {
Expand Down Expand Up @@ -11386,7 +11386,7 @@ var internals$jscomp$inline_2047 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2048 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -14903,4 +14903,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOMTesting-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -14007,7 +14007,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1673 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-78d2e9e2a-20230208",
version: "18.3.0-www-modern-3ff1540e9-20230209",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2072 = {
Expand Down Expand Up @@ -14038,7 +14038,7 @@ var internals$jscomp$inline_2072 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-78d2e9e2a-20230208"
reconcilerVersion: "18.3.0-next-3ff1540e9-20230209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2073 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -14369,4 +14369,4 @@ exports.unstable_flushControlled = function (fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-78d2e9e2a-20230208";
exports.version = "18.3.0-next-3ff1540e9-20230209";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactTestRenderer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -23911,7 +23911,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-classic-3ff1540e9-20230209";

// Might add PROFILE later.

Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactTestRenderer-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -23911,7 +23911,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-78d2e9e2a-20230208";
var ReactVersion = "18.3.0-www-modern-3ff1540e9-20230209";

// Might add PROFILE later.

Expand Down

0 comments on commit a206fbd

Please sign in to comment.