synapse 2.164.0__py311-none-any.whl → 2.166.0__py311-none-any.whl

synapse/tests/test_cortex.py

@@ -3084,7 +3084,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             otherpkg = {
                 'name': 'foosball',
                 'version': '0.0.1',
-                'synapse_minversion': (2, 144, 0),
                 'synapse_version': '>=2.8.0,<3.0.0',
             }
             self.none(await proxy.addStormPkg(otherpkg))
@@ -3138,7 +3137,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             oldverpkg = {
                 'name': 'versionfail',
                 'version': (0, 0, 1),
-                'synapse_minversion': (1337, 0, 0),
+                'synapse_version': '>=1337.0.0,<2000.0.0',
                 'commands': ()
             }
 
@@ -3148,7 +3147,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             oldverpkg = {
                 'name': 'versionfail',
                 'version': (0, 0, 1),
-                'synapse_minversion': [2, 144, 0],
                 'synapse_version': '>=1337.0.0,<2000.0.0',
                 'commands': ()
             }
@@ -3159,7 +3157,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             oldverpkg = {
                 'name': 'versionfail',
                 'version': (0, 0, 1),
-                'synapse_minversion': [2, 144, 0],
                 'synapse_version': '>=0.0.1,<2.0.0',
                 'commands': ()
             }
@@ -3173,7 +3170,6 @@ class CortexBasicTest(s_t_utils.SynTest):
                 'commands': ()
             }
 
-            # Package with no synapse_minversion shouldn't raise
             await core.addStormPkg(noverpkg)
 
             badcmdpkg = {
@@ -3225,83 +3221,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.eq(node, arg_hit['hit'][0])
             self.eq(arg_hit['hit'][1], 'weee')
 
-    async def test_cortex_onofftag(self):
-
-        async with self.getTestCore() as core:
-
-            tags = {}
-
-            def onadd(node, tag, valu):
-                tags[tag] = valu
-
-            def ondel(node, tag, valu):
-                self.none(node.getTag(tag))
-                self.false(node.hasTag(tag))
-                tags.pop(tag)
-
-            core.onTagAdd('foo', onadd)
-            core.onTagAdd('foo.bar', onadd)
-            core.onTagAdd('foo.bar.baz', onadd)
-
-            core.onTagDel('foo', ondel)
-            core.onTagDel('foo.bar', ondel)
-            core.onTagDel('foo.bar.baz', ondel)
-
-            core.onTagAdd('glob.*', onadd)
-            core.onTagDel('glob.*', ondel)
-
-            nodes = await core.nodes('[test:str=hehe]')
-            self.len(1, nodes)
-            node = nodes[0]
-            await node.addTag('foo.bar.baz', valu=(200, 300))
-
-            self.eq(tags.get('foo'), (None, None))
-            self.eq(tags.get('foo.bar'), (None, None))
-            self.eq(tags.get('foo.bar.baz'), (200, 300))
-
-            await node.delTag('foo.bar')
-
-            self.eq(tags.get('foo'), (None, None))
-
-            self.none(tags.get('foo.bar'))
-            self.none(tags.get('foo.bar.baz'))
-
-            core.offTagAdd('foo.bar', onadd)
-            core.offTagDel('foo.bar', ondel)
-            core.offTagAdd('foo.bar', lambda x: 0)
-            core.offTagDel('foo.bar', lambda x: 0)
-
-            await node.addTag('foo.bar', valu=(200, 300))
-            self.none(tags.get('foo.bar'))
-
-            tags['foo.bar'] = 'fake'
-            await node.delTag('foo.bar')
-            self.eq(tags.get('foo.bar'), 'fake')
-
-            # Coverage for removing something from a
-            # tag we never added a handler for.
-            core.offTagAdd('test.newp', lambda x: 0)
-            core.offTagDel('test.newp', lambda x: 0)
-
-            # Test tag glob handlers
-            await node.addTag('glob.foo', valu=(200, 300))
-            self.eq(tags.get('glob.foo'), (200, 300))
-
-            await node.delTag('glob.foo')
-            self.none(tags.get('glob.foo'))
-
-            await node.addTag('glob.foo.bar', valu=(200, 300))
-            self.none(tags.get('glob.foo.bar'))
-
-            # Test handlers don't run after removed
-            core.offTagAdd('glob.*', onadd)
-            core.offTagDel('glob.*', ondel)
-            await node.addTag('glob.faz', valu=(200, 300))
-            self.none(tags.get('glob.faz'))
-            tags['glob.faz'] = (1, 2)
-            await node.delTag('glob.faz')
-            self.eq(tags['glob.faz'], (1, 2))
-
     async def test_storm_logging(self):
         async with self.getTestCoreAndProxy() as (realcore, core):
             view = await core.callStorm('return( $lib.view.get().iden )')
@@ -4645,10 +4564,9 @@ class CortexBasicTest(s_t_utils.SynTest):
             await core1.addFeedData('syn.nodes', data)
             self.len(1, await core1.nodes('test:int=8 -#test.12345'))
 
-            # This tag does match regex
             data = [(('test:int', 8), {'tags': {'test.1234': (None, None)}})]
             await core1.addFeedData('syn.nodes', data)
-            self.len(0, await core1.nodes('test:int=8 -#test.1234'))
+            self.len(0, await core1.nodes('test:int=8 -#newtag.1234'))
 
             core1.view.layers[0].readonly = True
             await self.asyncraises(s_exc.IsReadOnly, core1.addFeedData('syn.nodes', data))
@@ -6400,66 +6318,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             msgs = await core.stormlist('cron.list')
             self.stormIsInPrint('$lib.print(woot)', msgs)
 
-    async def test_cortex_migrationmode(self):
-        async with self.getTestCore() as core:
-            async with core.getLocalProxy(user='root') as prox:
-
-                await prox.addUser('fred', passwd='secret')
-
-                self.true(core.agenda.enabled)
-                self.true(core.trigson)
-                async with await core.snap() as snap:
-                    self.true(snap.trigson)
-
-                # add triggers
-                # node:add case
-                tdef = {'cond': 'node:add', 'form': 'test:str', 'storm': '[ test:int=1 ]'}
-                await core.view.addTrigger(tdef)
-                await core.nodes('[ test:str=foo ]')
-                self.len(1, await core.nodes('test:int'))
-
-                # node:del case
-                tdef = {'cond': 'node:del', 'storm': '[ test:int=2 ]', 'form': 'test:str'}
-                await core.view.addTrigger(tdef)
-                await core.nodes('test:str=foo | delnode')
-                self.len(2, await core.nodes('test:int'))
-
-                # tag:add case
-                tdef = {'cond': 'tag:add', 'storm': '[ test:int=3 ]', 'tag': 'footag'}
-                await core.view.addTrigger(tdef)
-                await core.nodes('[ test:str=foo +#footag ]')
-                self.len(3, await core.nodes('test:int'))
-
-                # enable migration mode
-                await prox.enableMigrationMode()
-
-                self.false(core.agenda.enabled)
-                self.false(core.trigson)
-                async with await core.snap() as snap:
-                    self.false(snap.trigson)
-
-                # check that triggers don't fire
-                await core.nodes('test:int | delnode')
-                await core.nodes('[test:str=foo] [+#footag] | delnode')
-                self.len(0, await core.nodes('test:int'))
-
-                # disable migration mode
-                await prox.disableMigrationMode()
-
-                self.true(core.agenda.enabled)
-                self.true(core.trigson)
-                async with await core.snap() as snap:
-                    self.true(snap.trigson)
-
-                # check that triggers fire
-                await core.nodes('[test:str=foo] [+#footag] | delnode')
-                self.len(3, await core.nodes('test:int'))
-
-            async with core.getLocalProxy(user='fred') as prox:
-                # non-admin cannot enable/disable migration mode
-                await self.asyncraises(s_exc.AuthDeny, prox.enableMigrationMode())
-                await self.asyncraises(s_exc.AuthDeny, prox.disableMigrationMode())
-
     async def test_cortex_behold(self):
         async with self.getTestCore() as core:
             async with core.getLocalProxy() as prox:
@@ -6470,7 +6328,6 @@ class CortexBasicTest(s_t_utils.SynTest):
                         {  # type: ignore
                             'name': 'foo',
                             'version': (0, 0, 1),
-                            'synapse_minversion': [2, 144, 0],
                             'synapse_version': '>=2.100.0,<3.0.0',
                             'modules': [],
                             'commands': []
@@ -6578,7 +6435,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             'name': 'boom',
             'desc': 'The boom Module',
             'version': (0, 0, 1),
-            'synapse_minversion': (2, 8, 0),
+            'synapse_version': '>=2.8.0,<3.0.0',
             'modules': [
                 {
                     'name': 'boom.mod',
@@ -6651,6 +6508,21 @@ class CortexBasicTest(s_t_utils.SynTest):
                 self.eq(cm.exception.errinfo.get('mesg'),
                         "Storm package boom has unknown config var type newp.")
 
+                # Check no synapse_version and synapse_minversion > cortex version
+                minver = list(s_version.version)
+                minver[1] += 1
+                minver = tuple(minver)
+
+                pkg = copy.deepcopy(base_pkg)
+                pkg.pop('synapse_version')
+                pkg['synapse_minversion'] = minver
+                pkgname = pkg.get('name')
+
+                with self.raises(s_exc.BadVersion) as cm:
+                    await core.addStormPkg(pkg)
+                mesg = f'Storm package {pkgname} requires Synapse {minver} but Cortex is running {s_version.version}'
+                self.eq(cm.exception.errinfo.get('mesg'), mesg)
+
     async def test_cortex_view_persistence(self):
         with self.getTestDir() as dirn:
             async with self.getTestCore(dirn=dirn) as core:
@@ -7916,11 +7788,6 @@ class CortexBasicTest(s_t_utils.SynTest):
                     dirn00 = s_common.genpath(dirn, 'cell00')
                     dirn01 = s_common.genpath(dirn, 'cell01')
 
-                    conf = {
-                        'storm:pool': 'aha://pool00...',
-                        'storm:pool:timeout:sync': 1,
-                        'storm:pool:timeout:connection': 1
-                    }
                     core00 = await base.enter_context(self.addSvcToAha(aha, '00.core', s_cortex.Cortex, dirn=dirn00))
                     provinfo = {'mirror': '00.core'}
                     core01 = await base.enter_context(self.addSvcToAha(aha, '01.core', s_cortex.Cortex, dirn=dirn01, provinfo=provinfo))
@@ -7929,6 +7796,10 @@ class CortexBasicTest(s_t_utils.SynTest):
                     await core01.sync()
                     self.len(1, await core01.nodes('inet:asn=0'))
 
+                    msgs = await core00.stormlist('cortex.storm.pool.get')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('No Storm pool configuration found.', msgs)
+
                     msgs = await core00.stormlist('aha.pool.add pool00...')
                     self.stormHasNoWarnErr(msgs)
                     self.stormIsInPrint('Created AHA service pool: pool00.loop.vertex.link', msgs)
@@ -7937,9 +7808,18 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.stormHasNoWarnErr(msgs)
                     self.stormIsInPrint('AHA service (01.core...) added to service pool (pool00.loop.vertex.link)', msgs)
 
+                    msgs = await core00.stormlist('cortex.storm.pool.set newp')
+                    self.stormIsInErr(':// not found in [newp]', msgs)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.set --connection-timeout 1 --sync-timeout 1 aha://pool00...')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Storm pool configuration set.', msgs)
+
                     await core00.fini()
 
-                    core00 = await base.enter_context(self.getTestCore(dirn=dirn00, conf=conf))
+                    core00 = await base.enter_context(self.getTestCore(dirn=dirn00))
+
+                    await core00.stormpool.waitready(timeout=12)
 
                     with self.getLoggerStream('synapse') as stream:
                         msgs = await alist(core00.storm('inet:asn=0'))
@@ -8030,30 +7910,30 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Unable to get proxy', data)
+                    self.isin('Storm query mirror pool is empty, running query locally.', data)
 
                     with self.getLoggerStream('synapse') as stream:
                         self.true(await core00.callStorm('inet:asn=0 return($lib.true)'))
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Unable to get proxy', data)
+                    self.isin('Storm query mirror pool is empty, running query locally.', data)
 
                     with self.getLoggerStream('synapse') as stream:
                         self.len(1, await alist(core00.exportStorm('inet:asn=0')))
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Unable to get proxy', data)
+                    self.isin('Storm query mirror pool is empty, running query locally.', data)
 
                     with self.getLoggerStream('synapse') as stream:
                         self.eq(1, await core00.count('inet:asn=0'))
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Unable to get proxy', data)
+                    self.isin('Storm query mirror pool is empty, running query locally.', data)
 
-                    core01 = await base.enter_context(self.getTestCore(dirn=dirn01, conf=conf))
+                    core01 = await base.enter_context(self.getTestCore(dirn=dirn01))
                     await core01.promote(graceful=True)
 
                     self.true(core01.isactive)
@@ -8067,7 +7947,8 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Offloading Storm query', data)
+                    # test that it reverts to local when referencing self
+                    self.notin('Offloading Storm query', data)
                     self.notin('Timeout waiting for query mirror', data)
 
                     waiter = core01.stormpool.waiter(1, 'svc:del')
@@ -8092,3 +7973,48 @@ class CortexBasicTest(s_t_utils.SynTest):
                     stream.seek(0)
                     data = stream.read()
                     self.notin('Storm query mirror pool is empty', data)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.get')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Storm Pool URL: aha://pool00...', msgs)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.del')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Storm pool configuration removed.', msgs)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.get')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('No Storm pool configuration found.', msgs)
+
+                    msgs = await alist(core01.storm('inet:asn=0', opts={'mirror': False}))
+                    self.len(1, [m for m in msgs if m[0] == 'node'])
+
+    async def test_cortex_authgate(self):
+        # TODO - Remove this in 3.0.0
+        with self.getTestDir() as dirn:
+
+            async with self.getTestCore(dirn=dirn) as core:  # type: s_cortex.Cortex
+
+                unfo = await core.addUser('lowuser')
+                lowuser = unfo.get('iden')
+
+                msgs = await core.stormlist('auth.user.addrule lowuser --gate cortex node')
+                self.stormIsInWarn('Adding rule on the "cortex" authgate. This authgate is not used', msgs)
+                msgs = await core.stormlist('auth.role.addrule all --gate cortex hehe')
+                self.stormIsInWarn('Adding rule on the "cortex" authgate. This authgate is not used', msgs)
+
+                aslow = {'user': lowuser}
+
+                # The cortex authgate does nothing
+                with self.raises(s_exc.AuthDeny) as cm:
+                    await core.nodes('[test:str=hello]', opts=aslow)
+
+            with self.getAsyncLoggerStream('synapse.cortex') as stream:
+                async with self.getTestCore(dirn=dirn) as core:  # type: s_cortex.Cortex
+                    # The cortex authgate still does nothing
+                    with self.raises(s_exc.AuthDeny) as cm:
+                        await core.nodes('[test:str=hello]', opts=aslow)
+            stream.seek(0)
+            buf = stream.read()
+            self.isin('(lowuser) has a rule on the "cortex" authgate', buf)
+            self.isin('(all) has a rule on the "cortex" authgate', buf)

synapse/tests/test_datamodel.py

@@ -41,6 +41,28 @@ class DeprecatedModel(s_module.CoreModule):
 
 class DataModelTest(s_t_utils.SynTest):
 
+    async def test_datamodel_basics(self):
+        async with self.getTestCore() as core:
+            core.model.addType('woot:one', 'guid', {}, {
+                'display': {
+                    'columns': (
+                        {'type': 'newp', 'opts': {}},
+                    ),
+                },
+            })
+            with self.raises(s_exc.BadFormDef):
+                core.model.addForm('woot:one', {}, ())
+
+            core.model.addType('woot:two', 'guid', {}, {
+                'display': {
+                    'columns': (
+                        {'type': 'prop', 'opts': {'name': 'hehe'}},
+                    ),
+                },
+            })
+            with self.raises(s_exc.BadFormDef):
+                core.model.addForm('woot:two', {}, ())
+
     async def test_datamodel_formname(self):
         modl = s_datamodel.Model()
         mods = (

synapse/tests/test_lib_agenda.py

@@ -175,7 +175,6 @@ class AgendaTest(s_t_utils.SynTest):
                 await visi.setAdmin(True)
 
                 agenda = core.agenda
-                await agenda.start()  # make sure it doesn't blow up
 
                 self.eq([], agenda.list())
 
@@ -357,26 +356,22 @@ class AgendaTest(s_t_utils.SynTest):
                 self.eq(appt.lastresult, "raised exception StormRaise: errname='OmgWtfBbq' mesg='boom'")
 
                 # Test setting the global enable/disable flag
-                # reset
                 await agenda.delete(guid)
                 self.len(0, agenda.apptheap)
 
-                agenda._schedtask.cancel()
-                agenda._schedtask = agenda.schedCoro(agenda._scheduleLoop())
-
                 # schedule a query to run every Wednesday and Friday at 10:15am
                 cdef = {'creator': visi.iden, 'iden': s_common.guid(), 'storm': '$lib.queue.gen(visi).put(bar)',
+                        'pool': True,
                         'reqs': {s_tu.HOUR: 10, s_tu.MINUTE: 15},
                         'incunit': s_agenda.TimeUnit.DAYOFWEEK,
                         'incvals': (2, 4)}
                 adef = await agenda.add(cdef)
+
+                self.true(adef['pool'])
                 guid = adef.get('iden')
 
                 self.len(1, agenda.apptheap)
 
-                # disable crons and advance time
-                agenda.enabled = False
-
                 unixtime = datetime.datetime(year=2019, month=2, day=6, hour=10, minute=16, tzinfo=tz.utc).timestamp()
                 nexttime = datetime.datetime(year=2019, month=2, day=8, hour=10, minute=15, tzinfo=tz.utc).timestamp()
 
@@ -387,9 +382,6 @@ class AgendaTest(s_t_utils.SynTest):
                 self.true(appt.enabled)
                 self.eq(0, appt.startcount)
 
-                # enable crons and advance time
-                agenda.enabled = True
-
                 unixtime = datetime.datetime(year=2019, month=2, day=13, hour=10, minute=16, tzinfo=tz.utc).timestamp()
                 self.eq((12, 'bar'), await asyncio.wait_for(core.callStorm('return($lib.queue.gen(visi).pop(wait=$lib.true))'), timeout=5))
 
@@ -418,105 +410,65 @@ class AgendaTest(s_t_utils.SynTest):
 
     async def test_agenda_persistence(self):
         ''' Test we can make/change/delete appointments and they are persisted to storage '''
-        with self.getTestDir() as fdir:
-
-            core = mock.AsyncMock()
-
-            async def raiseOnBadStorm(q):
-                ''' Just enough storm parsing for this test '''
-                if (q[0] == '[') != (q[-1] == ']'):
-                    raise s_exc.BadSyntax(mesg='mismatched braces')
-                return 'all good'
-
-            core.getStormQuery = raiseOnBadStorm
-
-            async with await s_lmdbslab.Slab.anit(fdir, map_size=100000) as slab:
-                db = slab.initdb('hive')
-                hive = await s_hive.SlabHive.anit(slab, db=db)
-                core.hive = hive
-
-                async with await s_agenda.Agenda.anit(core) as agenda:
-                    await agenda.start()
-                    # Schedule a query to run every Wednesday and Friday at 10:15am
-                    cdef = {'creator': 'visi', 'iden': 'IDEN1', 'storm': '[test:str=bar]',
-                            'reqs': {s_tu.HOUR: 10, s_tu.MINUTE: 15},
-                            'incunit': s_agenda.TimeUnit.DAYOFWEEK,
-                            'incvals': (2, 4)}
-                    adef = await agenda.add(cdef)
-                    guid1 = adef.get('iden')
-
-                    # every 6th of the month at 7am and 8am (the 6th is a Thursday)
-                    cdef = {'creator': 'visi', 'iden': 'IDEN2', 'storm': '[test:str=baz]',
-                            'reqs': {s_tu.HOUR: (7, 8), s_tu.MINUTE: 0, s_tu.DAYOFMONTH: 6},
-                            'incunit': s_agenda.TimeUnit.MONTH,
-                            'incvals': 1}
-                    adef = await agenda.add(cdef)
-
-                    guid2 = adef.get('iden')
-                    appt = agenda.appts[guid2]
-                    appt.lasterrs.append('error happened')
-                    await appt.save()
 
-                    # Add an appt with an invalid query
-                    cdef = {'creator': 'visi', 'iden': 'BAD1', 'storm': '[test:str=',
-                            'reqs': {s_tu.HOUR: (7, 8)},
-                            'incunit': s_agenda.TimeUnit.MONTH,
-                            'incvals': 1}
-                    await self.asyncraises(s_exc.BadSyntax, agenda.add(cdef))
-
-                    # Add an appt with a bad version in storage
-                    cdef = {'creator': 'visi', 'iden': 'BAD2', 'storm': '[test:str=foo]',
-                            'reqs': {s_tu.HOUR: (7, 8)},
-                            'incunit': s_agenda.TimeUnit.MONTH,
-                            'incvals': 1}
-                    adef = await agenda.add(cdef)
-                    badguid2 = adef.get('iden')
+        with self.getTestDir() as dirn:
 
-                    adef['ver'] = 1337
-                    full = agenda._hivenode.full + (badguid2,)
-                    await agenda.core.hive.set(full, adef)
+            async with self.getTestCore(dirn=dirn) as core:
 
-                    xmas = {s_tu.DAYOFMONTH: 25, s_tu.MONTH: 12, s_tu.YEAR: 2099}
-                    lasthanu = {s_tu.DAYOFMONTH: 10, s_tu.MONTH: 12, s_tu.YEAR: 2099}
+                cdef = {'creator': core.auth.rootuser.iden,
+                        'storm': '[test:str=bar]',
+                        'reqs': {'hour': 10, 'minute': 15},
+                        'incunit': 'dayofweek',
+                        'incvals': (2, 4)}
+                adef = await core.addCronJob(cdef)
+                guid1 = adef.get('iden')
 
-                    await agenda.delete(guid1)
+                # every 6th of the month at 7am and 8am (the 6th is a Thursday)
+                cdef = {'creator': core.auth.rootuser.iden,
+                        'storm': '[test:str=baz]',
+                        'reqs': {'hour': (7, 8), 'minute': 0, 'dayofmonth': 6},
+                        'incunit': 'month',
+                        'incvals': 1}
+                adef = await core.addCronJob(cdef)
 
-                    # And one-shots for Christmas and last day of Hanukkah of 2018
-                    cdef = {'creator': 'visi', 'iden': 'IDEN3', 'storm': '#happyholidays',
-                            'reqs': (xmas, lasthanu)}
+                guid2 = adef.get('iden')
+                appt = core.agenda.appts[guid2]
+                appt.lasterrs.append('error happened')
+                await appt.save()
+
+                # Add an appt with an invalid query
+                cdef = {'creator': core.auth.rootuser.iden,
+                        'storm': '[test:str=',
+                        'reqs': {'hour': (7, 8)},
+                        'incunit': 'month',
+                        'incvals': 1}
 
-                    adef = await agenda.add(cdef)
-                    guid3 = adef.get('iden')
+                with self.raises(s_exc.BadSyntax):
+                    await core.addCronJob(cdef)
 
-                    await agenda.mod(guid3, '#bahhumbug')
+                xmas = {'dayofmonth': 25, 'month': 12, 'year': 2099}
+                lasthanu = {'dayofmonth': 10, 'month': 12, 'year': 2099}
 
-                async with await s_agenda.Agenda.anit(core) as agenda:
-                    await agenda.start()
-                    agenda.enabled = True
+                await core.delCronJob(guid1)
 
-                    appts = agenda.list()
-                    self.len(2, appts)
+                # And one-shots for Christmas and last day of Hanukkah of 2018
+                cdef = {'creator': core.auth.rootuser.iden,
+                        'storm': '#happyholidays',
+                        'reqs': (xmas, lasthanu)}
 
-                    last_appt = [appt for (iden, appt) in appts if iden == guid3][0]
-                    self.eq(last_appt.query, '#bahhumbug')
+                adef = await core.addCronJob(cdef)
+                guid3 = adef.get('iden')
 
-                    self.len(0, [appt for (iden, appt) in appts if iden == badguid2])
+                await core.updateCronJob(guid3, '#bahhumbug')
 
-    async def test_agenda_stop(self):
+            async with self.getTestCore(dirn=dirn) as core:
 
-        async with self.getTestCore() as core:
-            await core.callStorm('$lib.queue.add(foo)')
-            await core.callStorm('cron.add --minute +1 { $lib.queue.get(foo).put((99)) $lib.time.sleep(10) }')
-            appts = core.agenda.list()
-            await core.agenda._execute(appts[0][1])
-            self.eq((0, 99), await core.callStorm('return($lib.queue.get(foo).get())'))
+                appts = await core.listCronJobs()
 
-            appts[0][1].creator = 'fakeuser'
-            await core.agenda._execute(appts[0][1])
-            self.eq(appts[0][1].lastresult, 'Failed due to unknown user')
+                self.len(2, appts)
 
-            await core.agenda.stop()
-            self.false(core.agenda.enabled)
+                last_appt = [appt for appt in appts if appt.get('iden') == guid3][0]
+                self.eq(last_appt.get('query'), '#bahhumbug')
 
     async def test_agenda_custom_view(self):
 
@@ -685,7 +637,7 @@ class AgendaTest(s_t_utils.SynTest):
             nodes = await core.nodes('test:int=97', opts={'view': newview})
             self.len(0, nodes)
 
-    async def test_agenda_edit_creator(self):
+    async def test_agenda_edit(self):
 
         async with self.getTestCore() as core:
 
@@ -696,8 +648,12 @@ class AgendaTest(s_t_utils.SynTest):
             self.stormHasNoWarnErr(msgs)
 
             cdef = await core.callStorm('for $cron in $lib.cron.list() { return($cron) }')
+            self.false(cdef['pool'])
             self.eq(cdef['creator'], core.auth.rootuser.iden)
 
+            cdef = await core.callStorm('for $cron in $lib.cron.list() { $cron.set(pool, (true)) return($cron) }')
+            self.true(cdef['pool'])
+
             opts = {'vars': {'lowuser': lowuser}}
             cdef = await core.callStorm('for $cron in $lib.cron.list() { return($cron.set(creator, $lowuser)) }',
                                         opts=opts)