synapse 2.222.0__py311-none-any.whl → 2.223.0__py311-none-any.whl

synapse/tests/test_lib_aha.py

@@ -42,6 +42,20 @@ class ExecTeleCaller(s_cell.Cell):
             resp = await meth(*args, **kwargs)
             return resp
 
+class SpecialPathApi(s_cell.CellApi):
+    async def __anit__(self, cell, link, user, path):
+        await super().__anit__(cell, link, user)
+        self.path = path
+
+    async def getTestPath(self):
+        return self.path
+
+class PathAwareCell(s_cell.Cell):
+    async def getCellApi(self, link, user, path):
+        if not path:
+            return await self.cellapi.anit(self, link, user)
+        return await SpecialPathApi.anit(self, link, user, path)
+
 class AhaTest(s_test.SynTest):
 
     async def test_lib_aha_clone(self):
@@ -132,36 +146,36 @@ class AhaTest(s_test.SynTest):
 
     async def test_lib_aha_offon(self):
         with self.getTestDir() as dirn:
-            cryo0_dirn = s_common.gendir(dirn, 'cryo0')
+            cell0_dirn = s_common.gendir(dirn, 'cell0')
             async with self.getTestAha(dirn=dirn) as aha:
 
                 replaymult = 1
                 if s_common.envbool('SYNDEV_NEXUS_REPLAY'):
                     replaymult = 2
 
-                purl = await aha.addAhaSvcProv('0.cryo')
+                purl = await aha.addAhaSvcProv('0.cell')
 
                 wait00 = aha.waiter(1 * replaymult, 'aha:svcadd')
 
                 conf = {'aha:provision': purl}
-                async with self.getTestCryo(dirn=cryo0_dirn, conf=conf) as cryo:
+                async with self.getTestCell(dirn=cell0_dirn, conf=conf) as cell:
                     self.len(1 * replaymult, await wait00.wait(timeout=6))
 
-                    svc = await aha.getAhaSvc('0.cryo...')
+                    svc = await aha.getAhaSvc('0.cell...')
                     linkiden = svc.get('svcinfo', {}).get('online')
 
                     # Tear down the Aha cell.
                     await aha.__aexit__(None, None, None)
 
-            with self.getAsyncLoggerStream('synapse.lib.aha', f'Set [0.cryo.synapse] offline.') as stream:
+            with self.getAsyncLoggerStream('synapse.lib.aha', f'Set [0.cell.synapse] offline.') as stream:
                 async with self.getTestAha(dirn=dirn) as aha:
                     self.true(await asyncio.wait_for(stream.wait(), timeout=12))
-                    svc = await aha.getAhaSvc('0.cryo...')
+                    svc = await aha.getAhaSvc('0.cell...')
                     self.notin('online', svc.get('svcinfo'))
 
                     # Try setting something down a second time
-                    await aha.setAhaSvcDown('0.cryo', linkiden, network='synapse')
-                    svc = await aha.getAhaSvc('0.cryo...')
+                    await aha.setAhaSvcDown('0.cell', linkiden, network='synapse')
+                    svc = await aha.getAhaSvc('0.cell...')
                     self.notin('online', svc.get('svcinfo'))
 
     async def test_lib_aha_basics(self):
@@ -190,7 +204,7 @@ class AhaTest(s_test.SynTest):
 
         async with self.getTestAha() as aha:
 
-            cryo0_dirn = s_common.gendir(aha.dirn, 'cryo0')
+            cell0_dirn = s_common.gendir(aha.dirn, 'cell0')
 
             ahaurls = await aha.getAhaUrls()
 
@@ -200,76 +214,77 @@ class AhaTest(s_test.SynTest):
             if s_common.envbool('SYNDEV_NEXUS_REPLAY'):
                 replaymult = 2
 
-            conf = {'aha:provision': await aha.addAhaSvcProv('0.cryo')}
-            async with self.getTestCryo(dirn=cryo0_dirn, conf=conf) as cryo:
+            conf = {'aha:provision': await aha.addAhaSvcProv('0.cell')}
+            async with self.getTestCell(dirn=cell0_dirn, conf=conf) as cell:
 
                 await wait00.wait(timeout=2)
 
                 with self.raises(s_exc.NoSuchName):
                     await s_telepath.getAhaProxy({'host': 'hehe.haha'})
 
-                async with await s_telepath.openurl('aha://cryo...') as proxy:
+                async with await s_telepath.openurl('aha://cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
                 with self.raises(s_exc.BadArg):
-                    _proxy = await cryo.ahaclient.proxy(timeout=2)
-                    await _proxy.modAhaSvcInfo('cryo...', {'newp': 'newp'})
+                    _proxy = await cell.ahaclient.proxy(timeout=2)
+                    await _proxy.modAhaSvcInfo('cell...', {'newp': 'newp'})
 
-                async with await s_telepath.openurl('aha://0.cryo...') as proxy:
+                async with await s_telepath.openurl('aha://0.cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
                 # force a reconnect...
-                proxy = await cryo.ahaclient.proxy(timeout=2)
+                proxy = await cell.ahaclient.proxy(timeout=2)
                 async with aha.waiter(2 * replaymult, 'aha:svcadd'):
                     await proxy.fini()
 
-                async with await s_telepath.openurl('aha://cryo...') as proxy:
+                async with await s_telepath.openurl('aha://cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
                 # force the service into passive mode...
                 async with aha.waiter(3 * replaymult, 'aha:svcdown', 'aha:svcadd', timeout=6):
-                    await cryo.setCellActive(False)
+                    await cell.setCellActive(False)
 
                 with self.raises(s_exc.NoSuchName):
-                    async with await s_telepath.openurl('aha://cryo...') as proxy:
+                    async with await s_telepath.openurl('aha://cell...') as proxy:
                         pass
 
-                async with await s_telepath.openurl('aha://0.cryo...') as proxy:
+                async with await s_telepath.openurl('aha://0.cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
                 async with aha.waiter(1 * replaymult, 'aha:svcadd', timeout=6):
-                    await cryo.setCellActive(True)
+                    await cell.setCellActive(True)
 
-                async with await s_telepath.openurl('aha://cryo...') as proxy:
+                async with await s_telepath.openurl('aha://cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
             wait01 = aha.waiter(2 * replaymult, 'aha:svcadd')
 
-            conf = {'aha:provision': await aha.addAhaSvcProv('0.cryo')}
-            async with self.getTestCryo(conf=conf) as cryo:
+            conf = {'aha:provision': await aha.addAhaSvcProv('0.cell')}
+            async with self.getTestCell(ctor=PathAwareCell, conf=conf) as cell:
 
-                info = await cryo.getCellInfo()
+                info = await cell.getCellInfo()
+                celliden = info['cell']['iden']
 
-                self.eq(info['cell']['aha'], {'name': '0.cryo', 'leader': 'cryo', 'network': 'synapse'})
+                self.eq(info['cell']['aha'], {'name': '0.cell', 'leader': 'cell', 'network': 'synapse'})
 
                 await wait01.wait(timeout=2)
 
-                async with await s_telepath.openurl('aha://cryo.synapse') as proxy:
-                    self.nn(await proxy.getCellIden())
+                async with await s_telepath.openurl('aha://cell.synapse') as proxy:
+                    self.eq(celliden, await proxy.getCellIden())
 
-                async with await s_telepath.openurl('aha://0.cryo.synapse') as proxy:
-                    self.nn(await proxy.getCellIden())
-                    await proxy.puts('hehe', ('hehe', 'haha'))
+                async with await s_telepath.openurl('aha://0.cell.synapse') as proxy:
+                    self.eq(celliden, await proxy.getCellIden())
 
-                async with await s_telepath.openurl('aha://0.cryo.synapse/*/hehe') as proxy:
-                    self.nn(await proxy.iden())
+                async with await s_telepath.openurl('aha://0.cell.synapse/*/hehe/haha') as proxy:
+                    self.eq(celliden, await proxy.getCellIden())
+                    self.eq(('hehe', 'haha'), await proxy.getTestPath())
 
                 async with aha.getLocalProxy() as ahaproxy:
 
                     svcs = [x async for x in ahaproxy.getAhaSvcs('synapse')]
                     self.len(2, svcs)
                     names = [s['name'] for s in svcs]
-                    self.sorteq(('cryo.synapse', '0.cryo.synapse'), names)
+                    self.sorteq(('cell.synapse', '0.cell.synapse'), names)
 
                     self.none(await ahaproxy.getCaCert('vertex.link'))
                     cacert0 = await ahaproxy.genCaCert('vertex.link')
@@ -278,7 +293,7 @@ class AhaTest(s_test.SynTest):
                     self.eq(cacert0, cacert1)
                     self.eq(cacert0, await ahaproxy.getCaCert('vertex.link'))
 
-                    csrpem = cryo.certdir.genHostCsr('cryo.vertex.link').decode()
+                    csrpem = cell.certdir.genHostCsr('cell.vertex.link').decode()
 
                     hostcert00 = await ahaproxy.signHostCsr(csrpem)
                     hostcert01 = await ahaproxy.signHostCsr(csrpem)
@@ -287,7 +302,7 @@ class AhaTest(s_test.SynTest):
                     self.nn(hostcert01)
                     self.ne(hostcert00, hostcert01)
 
-                    csrpem = cryo.certdir.genUserCsr('visi@vertex.link').decode()
+                    csrpem = cell.certdir.genUserCsr('visi@vertex.link').decode()
 
                     usercert00 = await ahaproxy.signUserCsr(csrpem)
                     usercert01 = await ahaproxy.signUserCsr(csrpem)
@@ -310,7 +325,7 @@ class AhaTest(s_test.SynTest):
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
                     self.len(2, result)
-                    self.eq({'0.cryo.synapse', 'cryo.synapse'},
+                    self.eq({'0.cell.synapse', 'cell.synapse'},
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'synapse'}) as resp:
@@ -319,7 +334,7 @@ class AhaTest(s_test.SynTest):
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
                     self.len(2, result)
-                    self.eq({'0.cryo.synapse', 'cryo.synapse'},
+                    self.eq({'0.cell.synapse', 'cell.synapse'},
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'newp'}) as resp:
@@ -351,10 +366,10 @@ class AhaTest(s_test.SynTest):
                     self.eq(info.get('code'), 'AuthDeny')
 
             async with aha.getLocalProxy() as ahaproxy:
-                await ahaproxy.delAhaSvc('cryo', network='synapse')
-                await ahaproxy.delAhaSvc('0.cryo', network='synapse')
-                self.none(await ahaproxy.getAhaSvc('cryo.synapse'))
-                self.none(await ahaproxy.getAhaSvc('0.cryo.synapse'))
+                await ahaproxy.delAhaSvc('cell', network='synapse')
+                await ahaproxy.delAhaSvc('0.cell', network='synapse')
+                self.none(await ahaproxy.getAhaSvc('cell.synapse'))
+                self.none(await ahaproxy.getAhaSvc('0.cell.synapse'))
                 self.len(0, [s async for s in ahaproxy.getAhaSvcs()])
 
                 with self.raises(s_exc.BadArg):
@@ -431,24 +446,24 @@ class AhaTest(s_test.SynTest):
         async with self.getTestAha() as aha:
 
             wait00 = aha.waiter(1, 'aha:svcadd')
-            conf = {'aha:provision': await aha.addAhaSvcProv('0.cryo')}
+            conf = {'aha:provision': await aha.addAhaSvcProv('0.cell')}
 
-            async with self.getTestCryo(conf=conf) as cryo:
+            async with self.getTestCell(conf=conf) as cell:
 
                 self.true(await wait00.wait(timeout=2))
 
-                async with await s_telepath.openurl('aha://0.cryo...') as proxy:
+                async with await s_telepath.openurl('aha://0.cell...') as proxy:
                     self.nn(await proxy.getCellIden())
 
-                proxy = await cryo.ahaclient.proxy()
+                proxy = await cell.ahaclient.proxy()
 
                 # avoid race to notify client...
-                async with cryo.ahaclient.waiter(1, 'tele:client:linkloop', timeout=2):
+                async with cell.ahaclient.waiter(1, 'tele:client:linkloop', timeout=2):
                     await aha.fini()
                     self.true(await proxy.waitfini(timeout=10))
 
                 with self.raises(asyncio.TimeoutError):
-                    await cryo.ahaclient.proxy(timeout=0.1)
+                    await cell.ahaclient.proxy(timeout=0.1)
 
     async def test_lib_aha_onlink_fail(self):
 
@@ -463,12 +478,12 @@ class AhaTest(s_test.SynTest):
                 aha.testerr = True
                 wait00 = aha.waiter(1, 'aha:svcadd')
 
-                conf = {'aha:provision': await aha.addAhaSvcProv('0.cryo')}
-                async with self.getTestCryo(conf=conf) as cryo:
+                conf = {'aha:provision': await aha.addAhaSvcProv('0.cell')}
+                async with self.getTestCell(conf=conf) as cell:
 
                     self.none(await wait00.wait(timeout=2))
 
-                    svc = await aha.getAhaSvc('0.cryo...')
+                    svc = await aha.getAhaSvc('0.cell...')
                     self.none(svc)
 
                     wait01 = aha.waiter(1 * replaymult, 'aha:svcadd')
@@ -476,11 +491,11 @@ class AhaTest(s_test.SynTest):
 
                     self.nn(await wait01.wait(timeout=2))
 
-                    svc = await aha.getAhaSvc('0.cryo...')
+                    svc = await aha.getAhaSvc('0.cell...')
                     self.nn(svc)
                     self.nn(svc.get('svcinfo', {}).get('online'))
 
-                    async with await s_telepath.openurl('aha://0.cryo...') as proxy:
+                    async with await s_telepath.openurl('aha://0.cell...') as proxy:
                         self.nn(await proxy.getCellIden())
 
     async def test_lib_aha_bootstrap(self):

synapse/tests/test_lib_ast.py

@@ -3095,6 +3095,9 @@ class AstTest(s_test.SynTest):
             with self.raises(s_exc.StormRuntimeError):
                 self.len(1, await core.nodes('inet:ipv4=1.2.3.4 <(seen)- *=woot'))
 
+            with self.raises(s_exc.NoSuchForm):
+                self.len(1, await core.nodes('$foo=(null) inet:ipv4=1.2.3.4 <(seen)- $foo'))
+
             self.len(1, await core.nodes('inet:ipv4=1.2.3.4 <(seen)- *'))
             self.len(1, await core.nodes('inet:ipv4=1.2.3.4 <(seen)- meta:source'))
             self.len(1, await core.nodes('inet:ipv4=1.2.3.4 <(seen)- meta:source:name'))

synapse/tests/test_lib_cell.py

@@ -1587,22 +1587,22 @@ class CellTest(s_t_utils.SynTest):
 
         with self.getTestDir() as dirn:
 
-            async with self.getTestCryo(dirn=dirn) as cryo:
+            async with self.getTestCell(dirn=dirn) as cell:
 
-                cryo.certdir.genCaCert('localca')
-                cryo.certdir.genHostCert('localhost', signas='localca')
-                cryo.certdir.genUserCert('root@localhost', signas='localca')
-                cryo.certdir.genUserCert('newp@localhost', signas='localca')
+                cell.certdir.genCaCert('localca')
+                cell.certdir.genHostCert('localhost', signas='localca')
+                cell.certdir.genUserCert('root@localhost', signas='localca')
+                cell.certdir.genUserCert('newp@localhost', signas='localca')
 
-                root = await cryo.auth.addUser('root@localhost')
+                root = await cell.auth.addUser('root@localhost')
                 await root.setAdmin(True)
 
-            async with self.getTestCryo(dirn=dirn) as cryo:
+            async with self.getTestCell(dirn=dirn) as cell:
 
-                addr, port = await cryo.dmon.listen('ssl://0.0.0.0:0?hostname=localhost&ca=localca')
+                addr, port = await cell.dmon.listen('ssl://0.0.0.0:0?hostname=localhost&ca=localca')
 
                 async with await s_telepath.openurl(f'ssl://root@127.0.0.1:{port}?hostname=localhost') as proxy:
-                    self.eq(cryo.iden, await proxy.getCellIden())
+                    self.eq(cell.iden, await proxy.getCellIden())
 
                 with self.raises(s_exc.BadCertHost):
                     url = f'ssl://root@127.0.0.1:{port}?hostname=borked.localhost'
@@ -1616,12 +1616,12 @@ class CellTest(s_t_utils.SynTest):
                 self.eq(cm.exception.get('username'), 'newp@localhost')
 
                 # add newp
-                unfo = await cryo.addUser('newp@localhost')
+                unfo = await cell.addUser('newp@localhost')
                 async with await s_telepath.openurl(f'ssl://newp@127.0.0.1:{port}?hostname=localhost') as proxy:
-                    self.eq(cryo.iden, await proxy.getCellIden())
+                    self.eq(cell.iden, await proxy.getCellIden())
 
                 # Lock newp
-                await cryo.setUserLocked(unfo.get('iden'), True)
+                await cell.setUserLocked(unfo.get('iden'), True)
                 with self.raises(s_exc.AuthDeny) as cm:
                     url = f'ssl://newp@127.0.0.1:{port}?hostname=localhost'
                     async with await s_telepath.openurl(url) as proxy:

synapse/tests/test_lib_storm.py

@@ -1220,33 +1220,6 @@ class StormTest(s_t_utils.SynTest):
             ''')
             self.eq(email, 'visi@vertex.link')
 
-            pkg0 = {'name': 'hehe', 'version': '1.2.3'}
-            await core.addStormPkg(pkg0)
-            self.eq('1.2.3', await core.callStorm('return($lib.pkg.get(hehe).version)'))
-
-            self.eq(None, await core.callStorm('return($lib.pkg.get(nopkg))'))
-
-            pkg1 = {'name': 'haha', 'version': '1.2.3'}
-            await core.addStormPkg(pkg1)
-            msgs = await core.stormlist('pkg.list')
-            self.stormIsInPrint('haha', msgs)
-            self.stormIsInPrint('hehe', msgs)
-
-            self.true(await core.callStorm('return($lib.pkg.has(haha))'))
-
-            await core.delStormPkg('haha')
-            self.none(await core.callStorm('return($lib.pkg.get(haha))'))
-            self.false(await core.callStorm('return($lib.pkg.has(haha))'))
-
-            msgs = await core.stormlist('pkg.list --verbose')
-            self.stormIsInPrint('not available', msgs)
-
-            pkg2 = {'name': 'hoho', 'version': '4.5.6', 'build': {'time': 1732017600000}}
-            await core.addStormPkg(pkg2)
-            self.eq('4.5.6', await core.callStorm('return($lib.pkg.get(hoho).version)'))
-            msgs = await core.stormlist('pkg.list --verbose')
-            self.stormIsInPrint('2024-11-19 12:00:00', msgs)
-
             # test for $lib.queue.gen()
             self.eq(0, await core.callStorm('return($lib.queue.gen(woot).size())'))
             # and again to test *not* creating it...
@@ -1575,161 +1548,6 @@ class StormTest(s_t_utils.SynTest):
                 nodes = [x for x in msgs if x[0] == 'node']
                 self.len(0, nodes)
 
-            pkgdef = {
-                'name': 'foobar',
-                'version': '1.2.3',
-            }
-
-            await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (),
-                'conflicts': (),
-            }, deps)
-
-            pkgdef = {
-                'name': 'bazfaz',
-                'version': '2.2.2',
-                'depends': {
-                    'conflicts': (
-                        {'name': 'foobar'},
-                    ),
-                }
-            }
-
-            with self.raises(s_exc.StormPkgConflicts):
-                await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (),
-                'conflicts': (
-                    {'name': 'foobar', 'version': None, 'desc': None, 'ok': False, 'actual': '1.2.3'},
-                )
-            }, deps)
-
-            pkgdef = {
-                'name': 'bazfaz',
-                'version': '2.2.2',
-                'depends': {
-                    'conflicts': (
-                        {'name': 'foobar', 'version': '>=1.0.0', 'desc': 'foo'},
-                    ),
-                }
-            }
-
-            with self.raises(s_exc.StormPkgConflicts):
-                await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (),
-                'conflicts': (
-                    {'name': 'foobar', 'version': '>=1.0.0', 'desc': 'foo', 'ok': False, 'actual': '1.2.3'},
-                )
-            }, deps)
-
-            pkgdef = {
-                'name': 'bazfaz',
-                'version': '2.2.2',
-                'depends': {
-                    'requires': (
-                        {'name': 'foobar', 'version': '>=2.0.0,<3.0.0'},
-                    ),
-                }
-            }
-
-            with self.getAsyncLoggerStream('synapse.cortex', 'bazfaz requirement') as stream:
-                await core.addStormPkg(pkgdef)
-                self.true(await stream.wait(timeout=1))
-
-            pkgdef = {
-                'name': 'bazfaz',
-                'version': '2.2.2',
-                'depends': {
-                    'requires': (
-                        {'name': 'foobar', 'version': '>=2.0.0,<3.0.0', 'optional': True},
-                    ),
-                }
-            }
-
-            with self.getAsyncLoggerStream('synapse.cortex', 'bazfaz optional requirement') as stream:
-                await core.addStormPkg(pkgdef)
-                self.true(await stream.wait(timeout=1))
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (
-                    {'name': 'foobar', 'version': '>=2.0.0,<3.0.0', 'desc': None,
-                     'ok': False, 'actual': '1.2.3', 'optional': True},
-                ),
-                'conflicts': ()
-            }, deps)
-
-            pkgdef = {
-                'name': 'lolzlolz',
-                'version': '1.2.3',
-            }
-
-            await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (),
-                'conflicts': (),
-            }, deps)
-
-            pkgdef = {
-                'name': 'bazfaz',
-                'version': '2.2.2',
-                'depends': {
-                    'requires': (
-                        {'name': 'lolzlolz', 'version': '>=1.0.0,<2.0.0', 'desc': 'lol'},
-                    ),
-                    'conflicts': (
-                        {'name': 'foobar', 'version': '>=3.0.0'},
-                    ),
-                }
-            }
-
-            await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (
-                    {'name': 'lolzlolz', 'version': '>=1.0.0,<2.0.0', 'desc': 'lol', 'ok': True, 'actual': '1.2.3'},
-                ),
-                'conflicts': (
-                    {'name': 'foobar', 'version': '>=3.0.0', 'desc': None, 'ok': True, 'actual': '1.2.3'},
-                )
-            }, deps)
-
-            pkgdef = {
-                'name': 'zoinkszoinks',
-                'version': '2.2.2',
-                'depends': {
-                    'requires': (
-                        {'name': 'newpnewp', 'version': '1.2.3'},
-                    ),
-                    'conflicts': (
-                        {'name': 'newpnewp'},
-                    ),
-                }
-            }
-
-            await core.addStormPkg(pkgdef)
-
-            deps = await core.callStorm('return($lib.pkg.deps($pkgdef))', opts={'vars': {'pkgdef': pkgdef}})
-            self.eq({
-                'requires': (
-                    {'name': 'newpnewp', 'version': '1.2.3', 'desc': None, 'ok': False, 'actual': None},
-                ),
-                'conflicts': (
-                    {'name': 'newpnewp', 'version': None, 'desc': None, 'ok': True, 'actual': None},
-                )
-            }, deps)
-
             # force old-cron behavior which lacks a view
             await core.nodes('cron.add --hourly 03 { inet:ipv4 }')
             for (iden, cron) in core.agenda.list():
@@ -2980,72 +2798,6 @@ class StormTest(s_t_utils.SynTest):
             with self.raises(s_exc.NoSuchVar):
                 await core.callStorm('$foo = 10 $foo = $lib.undef return($foo)')
 
-    async def test_storm_pkg_load(self):
-        cont = s_common.guid()
-        pkg = {
-            'name': 'testload',
-            'version': '0.3.0',
-            'modules': (
-                {
-                    'name': 'testload',
-                    'storm': 'function x() { return((0)) }',
-                },
-            ),
-            'onload': f'[ ps:contact={cont} ] $lib.print(teststring) $lib.warn(testwarn, key=valu) return($path.vars.newp)'
-        }
-        class PkgHandler(s_httpapi.Handler):
-
-            async def get(self, name):
-                assert self.request.headers.get('X-Synapse-Version') == s_version.verstring
-
-                if name == 'notok':
-                    self.sendRestErr('FooBar', 'baz faz')
-                    return
-
-                self.sendRestRetn(pkg)
-
-        class PkgHandlerRaw(s_httpapi.Handler):
-            async def get(self, name):
-                assert self.request.headers.get('X-Synapse-Version') == s_version.verstring
-
-                self.set_header('Content-Type', 'application/json')
-                return self.write(pkg)
-
-        async with self.getTestCore() as core:
-            core.addHttpApi('/api/v1/pkgtest/(.*)', PkgHandler, {'cell': core})
-            core.addHttpApi('/api/v1/pkgtestraw/(.*)', PkgHandlerRaw, {'cell': core})
-            port = (await core.addHttpsPort(0, host='127.0.0.1'))[1]
-
-            msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/newp/newp')
-            self.stormIsInWarn('pkg.load got HTTP code: 404', msgs)
-
-            msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/notok')
-            self.stormIsInWarn('pkg.load got JSON error: FooBar', msgs)
-
-            # onload will on fire once. all other pkg.load events will effectively bounce
-            # because the pkg hasn't changed so no loading occurs
-            waiter = core.waiter(1, 'core:pkg:onload:complete')
-
-            with self.getAsyncLoggerStream('synapse.cortex') as stream:
-                msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/yep')
-                self.stormIsInPrint('testload @0.3.0', msgs)
-
-                msgs = await core.stormlist(f'pkg.load --ssl-noverify --raw https://127.0.0.1:{port}/api/v1/pkgtestraw/yep')
-                self.stormIsInPrint('testload @0.3.0', msgs)
-
-            stream.seek(0)
-            buf = stream.read()
-            self.isin("testload onload output: teststring", buf)
-            self.isin("testload onload output: testwarn", buf)
-            self.isin("No var with name: newp", buf)
-            self.len(1, await core.nodes(f'ps:contact={cont}'))
-
-            evnts = await waiter.wait(timeout=4)
-            exp = [
-                ('core:pkg:onload:complete', {'pkg': 'testload'})
-            ]
-            self.eq(exp, evnts)
-
     async def test_storm_pkg_onload_active(self):
         pkg = {
             'name': 'testload',
@@ -3294,6 +3046,37 @@ class StormTest(s_t_utils.SynTest):
                         await stream.wait(timeout=10)
                         self.eq(8, await core.getStormPkgVar('testload', 'testload:version'))
 
+                    # init that advances the version
+
+                    pkg['version'] = '0.7.0'
+                    pkg['inits']['versions'].extend([
+                        {
+                            'version': 9,
+                            'name': 'init09',
+                            'query': '''
+                                $lib.globals.set(init09, $lib.time.now())
+                                $lib.pkg.vars(testload)."testload:version" = (10)
+                            ''',
+                        },
+                        {
+                            'version': 10,
+                            'name': 'init10',
+                            'query': '$lib.globals.set(init10, $lib.time.now())',
+                        },
+                        {
+                            'version': 11,
+                            'name': 'init11',
+                            'query': '$lib.globals.set(init11, $lib.time.now())',
+                        },
+                    ])
+
+                    await loadPkg(core, pkg)
+
+                    self.eq(11, await core.getStormPkgVar('testload', 'testload:version'))
+                    self.nn(await core.getStormVar('init09'))
+                    self.none(await core.getStormVar('init10'))
+                    self.nn(await core.getStormVar('init11'))
+
     async def test_storm_tree(self):
 
         async with self.getTestCore() as core: