Skip to content

Commit fa2a0b6

Browse files
authored
Fix pkg onload test race (#3533)
1 parent c7c7530 commit fa2a0b6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

synapse/tests/test_lib_storm.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,7 +2092,9 @@ async def get(self, name):
20922092
msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/notok')
20932093
self.stormIsInWarn('pkg.load got JSON error: FooBar', msgs)
20942094

2095-
waiter = core.waiter(2, 'core:pkg:onload:complete')
2095+
replay = s_common.envbool('SYNDEV_NEXUS_REPLAY')
2096+
nevents = 4 if replay else 2
2097+
waiter = core.waiter(nevents, 'core:pkg:onload:complete')
20962098

20972099
with self.getAsyncLoggerStream('synapse.cortex') as stream:
20982100
msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/yep')
@@ -2109,10 +2111,10 @@ async def get(self, name):
21092111
self.len(1, await core.nodes(f'ps:contact={cont}'))
21102112

21112113
evnts = await waiter.wait(timeout=2)
2112-
self.eq([
2113-
('core:pkg:onload:complete', {'pkg': 'testload'}),
2114-
('core:pkg:onload:complete', {'pkg': 'testload'}),
2115-
], evnts)
2114+
exp = []
2115+
for _ in range(nevents):
2116+
exp.append(('core:pkg:onload:complete', {'pkg': 'testload'}))
2117+
self.eq(exp, evnts)
21162118

21172119
async def test_storm_tree(self):
21182120

0 commit comments

Comments
 (0)