Skip to content

Commit fe9ff42

Browse files
committed
fixup! fix deepEqual tests
1 parent 6f51da4 commit fe9ff42

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed

packages/SwingSet/test/promises.test.js

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// eslint-disable-next-line import/order
33
import { test } from '../tools/prepare-test-env-ava.js';
44

5+
import { compareRank } from '@endo/marshal';
56
import { passableSymbolForName } from '@agoric/internal';
67
import { kser, kslot, kunser } from '@agoric/kmarshal';
78
import {
@@ -269,25 +270,37 @@ test('local promises are rejected by vat upgrade', async t => {
269270
await messageToObject(watcher, 'watchLocalPromise', 'fulfilled', S);
270271
await messageToObject(watcher, 'watchLocalPromise', 'rejected', undefined, S);
271272
const v1Settlements = await messageToObject(watcher, 'getSettlements');
272-
t.deepEqual(v1Settlements, {
273-
fulfilled: { status: 'fulfilled', value: S },
274-
rejected: { status: 'rejected', reason: S },
275-
});
273+
t.is(
274+
compareRank(
275+
v1Settlements,
276+
harden({
277+
fulfilled: { status: 'fulfilled', value: S },
278+
rejected: { status: 'rejected', reason: S },
279+
}),
280+
),
281+
0,
282+
);
276283
await messageToVat('bootstrap', 'upgradeVat', {
277284
name: 'watcher',
278285
bundleCapName: 'watcher',
279286
});
280287
const v2Settlements = await messageToObject(watcher, 'getSettlements');
281-
t.deepEqual(v2Settlements, {
282-
fulfilled: { status: 'fulfilled', value: S },
283-
rejected: { status: 'rejected', reason: S },
284-
orphaned: {
285-
status: 'rejected',
286-
reason: {
287-
name: 'vatUpgraded',
288-
upgradeMessage: 'vat upgraded',
289-
incarnationNumber: 0,
290-
},
291-
},
292-
});
288+
t.is(
289+
compareRank(
290+
v2Settlements,
291+
harden({
292+
fulfilled: { status: 'fulfilled', value: S },
293+
rejected: { status: 'rejected', reason: S },
294+
orphaned: {
295+
status: 'rejected',
296+
reason: {
297+
name: 'vatUpgraded',
298+
upgradeMessage: 'vat upgraded',
299+
incarnationNumber: 0,
300+
},
301+
},
302+
}),
303+
),
304+
0,
305+
);
293306
});

packages/store/test/store.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ test('passability of store iters', t => {
128128
m.init('x', 8);
129129
m.init('y', 7);
130130
const keys = m.keys();
131-
t.is(passStyleOf(keys), 'remotable');
131+
t.throws(() => passStyleOf(keys), {
132+
message:
133+
'Remotables can only have string-named methods: "Symbol(Symbol.iterator)"',
134+
});
132135
const iter = keys[Symbol.iterator]();
133136
t.is(passStyleOf(iter), 'remotable');
134137
const iterResult = iter.next();

0 commit comments

Comments
 (0)