synapse 2.199.0__py311-none-any.whl → 2.201.0__py311-none-any.whl

synapse/models/economic.py

@@ -67,10 +67,10 @@ class EconModule(s_module.CoreModule):
                     'doc': 'A financial security which is typically traded on an exchange.'}),
 
                 ('econ:fin:bar', ('guid', {}), {
-                    'doc': 'A sample of the open, close, high, low prices of a security in a specific time window'}),
+                    'doc': 'A sample of the open, close, high, low prices of a security in a specific time window.'}),
 
                 ('econ:fin:tick', ('guid', {}), {
-                    'doc': 'A sample of the price of a security at a single moment in time'}),
+                    'doc': 'A sample of the price of a security at a single moment in time.'}),
 
                 ('econ:bank:account:type:taxonomy', ('taxonomy', {}), {
                     'doc': 'A bank account type taxonomy.'}),
@@ -192,10 +192,10 @@ class EconModule(s_module.CoreModule):
                         'doc': 'The campaign that the purchase was in support of.'}),
 
                     ('price', ('econ:price', {}), {
-                        'doc': 'The econ:price of the purchase'}),
+                        'doc': 'The econ:price of the purchase.'}),
 
                     ('currency', ('econ:currency', {}), {
-                        'doc': 'The econ:price of the purchase'}),
+                        'doc': 'The econ:price of the purchase.'}),
 
                     ('listing', ('biz:listing', {}), {
                         'doc': 'The purchase was made based on the given listing.'}),
@@ -283,10 +283,10 @@ class EconModule(s_module.CoreModule):
                         'doc': 'The purchase which the payment was paying for.'}),
 
                     ('amount', ('econ:price', {}), {
-                        'doc': 'The amount of money transferred in the payment'}),
+                        'doc': 'The amount of money transferred in the payment.'}),
 
                     ('currency', ('econ:currency', {}), {
-                        'doc': 'The currency of the payment'}),
+                        'doc': 'The currency of the payment.'}),
 
                     ('memo', ('str', {}), {
                         'doc': 'A small note specified by the payer common in financial transactions.'}),
@@ -339,66 +339,66 @@ class EconModule(s_module.CoreModule):
                 ('econ:fin:exchange', {}, (
 
                     ('name', ('str', {'lower': True, 'strip': True}), {
-                        'doc': 'A simple name for the exchange',
+                        'doc': 'A simple name for the exchange.',
                         'ex': 'nasdaq'}),
 
                     ('org', ('ou:org', {}), {
-                        'doc': 'The organization that operates the exchange'}),
+                        'doc': 'The organization that operates the exchange.'}),
 
                     ('currency', ('econ:currency', {}), {
-                        'doc': 'The currency used for all transactions in the exchange',
+                        'doc': 'The currency used for all transactions in the exchange.',
                         'ex': 'usd'}),
                 )),
 
                 ('econ:fin:security', {}, (
 
                     ('exchange', ('econ:fin:exchange', {}), {
-                        'doc': 'The exchange on which the security is traded'}),
+                        'doc': 'The exchange on which the security is traded.'}),
 
                     ('ticker', ('str', {'lower': True, 'strip': True}), {
-                        'doc': 'The identifier for this security within the exchange'}),
+                        'doc': 'The identifier for this security within the exchange.'}),
 
                     ('type', ('str', {'lower': True, 'strip': True}), {
-                        'doc': 'A user defined type such as stock, bond, option, future, or forex'}),
+                        'doc': 'A user defined type such as stock, bond, option, future, or forex.'}),
 
                     ('price', ('econ:price', {}), {
-                        'doc': 'The last known/available price of the security'}),
+                        'doc': 'The last known/available price of the security.'}),
 
                     ('time', ('time', {}), {
-                        'doc': 'The time of the last know price sample'}),
+                        'doc': 'The time of the last know price sample.'}),
                 )),
 
                 ('econ:fin:tick', {}, (
 
                     ('security', ('econ:fin:security', {}), {
-                        'doc': 'The security measured by the tick'}),
+                        'doc': 'The security measured by the tick.'}),
 
                     ('time', ('time', {}), {
-                        'doc': 'The time the price was sampled'}),
+                        'doc': 'The time the price was sampled.'}),
 
                     ('price', ('econ:price', {}), {
-                        'doc': 'The price of the security at the time'}),
+                        'doc': 'The price of the security at the time.'}),
                 )),
 
                 ('econ:fin:bar', {}, (
 
                     ('security', ('econ:fin:security', {}), {
-                        'doc': 'The security measured by the bar'}),
+                        'doc': 'The security measured by the bar.'}),
 
                     ('ival', ('ival', {}), {
-                        'doc': 'The interval of measurement'}),
+                        'doc': 'The interval of measurement.'}),
 
                     ('price:open', ('econ:price', {}), {
-                        'doc': 'The opening price of the security'}),
+                        'doc': 'The opening price of the security.'}),
 
                     ('price:close', ('econ:price', {}), {
-                        'doc': 'The closing price of the security'}),
+                        'doc': 'The closing price of the security.'}),
 
                     ('price:low', ('econ:price', {}), {
-                        'doc': 'The low price of the security'}),
+                        'doc': 'The low price of the security.'}),
 
                     ('price:high', ('econ:price', {}), {
-                        'doc': 'The high price of the security'}),
+                        'doc': 'The high price of the security.'}),
                 )),
 
                 ('econ:acct:invoice', {}, (

synapse/models/files.py

@@ -270,7 +270,7 @@ class FileModule(s_module.CoreModule):
                         ('file', ('file:bytes', {}), {
                             'doc': 'The Mach-O file containing the load command.'}),
                         ('type', ('int', {'enums': s_l_macho.getLoadCmdTypes()}), {
-                            'doc': 'The type of the load command'}),
+                            'doc': 'The type of the load command.'}),
                         ('size', ('int', {}), {
                             'doc': 'The size of the load command structure in bytes.'}),
                     ),
@@ -724,7 +724,7 @@ class FileModule(s_module.CoreModule):
                     ('sha256', ('hash:sha256', {}), {
                         'doc': 'The sha256 hash of the bytes of the Mach-O section.'}),
                     ('offset', ('int', {}), {
-                        'doc': 'The file offset to the beginning of the section'}),
+                        'doc': 'The file offset to the beginning of the section.'}),
                 )),
 
                 ('file:mime:lnk', {}, (

synapse/models/inet.py

@@ -1332,7 +1332,7 @@ class InetModule(s_module.CoreModule):
 
                     ('inet:ssl:cert', ('comp', {'fields': (('server', 'inet:server'), ('file', 'file:bytes'))}), {
                         'deprecated': True,
-                        'doc': 'Deprecated. Please use inet:tls:servercert or inet:tls:clientcert',
+                        'doc': 'Deprecated. Please use inet:tls:servercert or inet:tls:clientcert.',
                     }),
 
                     ('inet:port', ('int', {'min': 0, 'max': 0xffff}), {
@@ -3802,7 +3802,7 @@ class InetModule(s_module.CoreModule):
 
                         ('client:address', ('inet:client', {}), {
                             'deprecated': True,
-                            'doc': 'Deprecated. Please use :client'}),
+                            'doc': 'Deprecated. Please use :client.'}),
 
                         ('client:software', ('it:prod:softver', {}), {
                             'doc': 'The client software version used to send the message.'}),

synapse/models/infotech.py

@@ -641,10 +641,10 @@ class ItModule(s_module.CoreModule):
                     'doc': 'Semantic Version type.',
                 }),
                 ('it:sec:cpe', 'synapse.models.infotech.Cpe23Str', {}, {
-                    'doc': 'A NIST CPE 2.3 Formatted String',
+                    'doc': 'A NIST CPE 2.3 Formatted String.',
                 }),
                 ('it:sec:cpe:v2_2', 'synapse.models.infotech.Cpe22Str', {}, {
-                    'doc': 'A NIST CPE 2.2 Formatted String',
+                    'doc': 'A NIST CPE 2.2 Formatted String.',
                 }),
             ),
             'types': (
@@ -697,7 +697,7 @@ class ItModule(s_module.CoreModule):
                     'ex': 'cve-2012-0158'
                 }),
                 ('it:sec:cwe', ('str', {'regex': r'^CWE-[0-9]{1,8}$'}), {
-                    'doc': 'NIST NVD Common Weaknesses Enumeration Specification',
+                    'doc': 'NIST NVD Common Weaknesses Enumeration Specification.',
                     'ex': 'CWE-120',
                 }),
 
@@ -1297,7 +1297,7 @@ class ItModule(s_module.CoreModule):
                 )),
                 ('it:account', {}, (
                     ('user', ('inet:user', {}), {
-                        'doc': 'The username associated with the account',
+                        'doc': 'The username associated with the account.',
                     }),
                     ('contact', ('ps:contact', {}), {
                         'doc': 'Additional contact information associated with this account.',
@@ -1977,7 +1977,7 @@ class ItModule(s_module.CoreModule):
                         'doc': 'The commit that produced this diff.'}),
 
                     ('file', ('file:bytes', {}), {
-                        'doc': 'The file after the commit has been applied'}),
+                        'doc': 'The file after the commit has been applied.'}),
 
                     ('path', ('file:path', {}), {
                         'doc': 'The path to the file in the repo that the diff is being applied to.'}),
@@ -2272,7 +2272,7 @@ class ItModule(s_module.CoreModule):
                         'disp': {'hint': 'text'},
                     }),
                     ('cpe', ('it:sec:cpe', {}), {
-                        'doc': 'The NIST CPE 2.3 string specifying this software version',
+                        'doc': 'The NIST CPE 2.3 string specifying this software version.',
                     }),
                     ('cves', ('array', {'type': 'it:sec:cve', 'uniq': True, 'sorted': True}), {
                         'doc': 'A list of CVEs that apply to this software version.',
@@ -2420,7 +2420,7 @@ class ItModule(s_module.CoreModule):
                         'doc': 'Set if this result was part of running multiple scanners.'}),
 
                     ('multi:count', ('int', {'min': 0}), {
-                        'doc': 'The total number of scanners which were run by a multi-scanner'}),
+                        'doc': 'The total number of scanners which were run by a multi-scanner.'}),
 
                     ('multi:count:benign', ('int', {'min': 0}), {
                         'doc': 'The number of scanners which returned a benign verdict.'}),

synapse/models/person.py

@@ -198,7 +198,7 @@ class PsModule(s_module.CoreModule):
                         'doc': 'The last date the student attended a class.',
                     }),
                     ('classes', ('array', {'type': 'edu:class', 'uniq': True, 'sorted': True}), {
-                        'doc': 'The classes attended by the student',
+                        'doc': 'The classes attended by the student.',
                     }),
                     ('achievement', ('ps:achievement', {}), {
                         'doc': 'The achievement awarded to the individual.',

synapse/models/proj.py

@@ -173,7 +173,7 @@ class ProjectModule(s_module.CoreModule):
                             'doc': 'The ticket the comment was added to.'}),
 
                         ('text', ('str', {}), {
-                            'doc': 'The text of the comment'}),
+                            'doc': 'The text of the comment.'}),
                         # -(refs)> thing comment is about
                     )),
 
@@ -244,7 +244,8 @@ class ProjectModule(s_module.CoreModule):
                             'doc': 'The sprint that contains the ticket.'}),
 
                         ('type', ('str', {'lower': True, 'strip': True}), {
-                            'doc': 'The type of ticket. (eg story / bug)'}),
+                            'doc': 'The type of ticket.',
+                            'ex': 'bug'}),
                     )),
                 ),
             }),

synapse/models/risk.py

@@ -97,7 +97,7 @@ class RiskModule(s_module.CoreModule):
                     },
                 }),
                 ('risk:mitigation:type:taxonomy', ('taxonomy', {}), {
-                    'interaces': ('taxonomy',),
+                    'interfaces': ('meta:taxonomy',),
                     'doc': 'A taxonomy of mitigation types.',
                 }),
                 ('risk:mitigation', ('guid', {}), {

synapse/models/transport.py

@@ -102,7 +102,7 @@ class TransportModule(s_module.CoreModule):
                     'doc': 'An individual sea vessel.'}),
 
                 ('transport:sea:mmsi', ('str', {'regex': '[0-9]{9}'}), {
-                    'doc': 'A Maritime Mobile Service Identifier'}),
+                    'doc': 'A Maritime Mobile Service Identifier.'}),
 
                 ('transport:sea:imo', ('str', {'lower': True, 'strip': True, 'replace': ((' ', ''),), 'regex': '^imo[0-9]{7}$'}), {
                     'doc': 'An International Maritime Organization registration number.'}),
@@ -349,7 +349,7 @@ class TransportModule(s_module.CoreModule):
                 )),
                 ('transport:air:port', {}, (
                     ('name', ('str', {'lower': True, 'onespace': True}), {
-                        'doc': 'The name of the airport'}),
+                        'doc': 'The name of the airport.'}),
                     ('place', ('geo:place', {}), {
                         'doc': 'The place where the IATA airport code is assigned.'}),
                 )),
@@ -462,7 +462,7 @@ class TransportModule(s_module.CoreModule):
                         'doc': 'Deprecated. Please use :phys:length.'}),
 
                     ('beam', ('geo:dist', {}), {
-                        'doc': 'The official overall vessel beam'}),
+                        'doc': 'The official overall vessel beam.'}),
 
                     ('flag', ('iso:3166:cc', {}), {
                         'doc': 'The country the vessel is flagged to.'}),

synapse/tests/test_cortex.py

@@ -4629,12 +4629,6 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.len(2, await core.nodes('[ inet:dns:a=(vertex.link,1.2.3.4) inet:dns:a=(woot.com,5.6.7.8)]'))
             self.len(4, await core.nodes('inet:dns:a inet:fqdn=:fqdn'))
 
-    async def test_cortex_hive(self):
-        async with self.getTestCore() as core:
-            await core.hive.set(('visi',), 200)
-            async with core.getLocalProxy(share='cortex/hive') as hive:
-                self.eq(200, await hive.get(('visi',)))
-
     async def test_cortex_delnode_perms(self):
 
         async with self.getTestCore() as core:
@@ -7403,6 +7397,9 @@ class CortexBasicTest(s_t_utils.SynTest):
                 self.len(1, await core.nodes('media:news -(refs)> *', opts={'view': altview}))
                 self.eq(2, await proxy.feedFromAxon(sha256))
 
+                opts['limit'] = 1
+                self.len(1, await alist(proxy.exportStorm('media:news inet:email', opts=opts)))
+
             async with self.getHttpSess(port=port) as sess:
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export')
                 self.eq(401, resp.status)

synapse/tests/test_datamodel.py

@@ -44,6 +44,8 @@ class DataModelTest(s_t_utils.SynTest):
 
     async def test_datamodel_basics(self):
         async with self.getTestCore() as core:
+            iface = core.model.ifaces.get('phys:object')
+            self.eq('object', iface['template']['phys:object'])
             core.model.addType('woot:one', 'guid', {}, {
                 'display': {
                     'columns': (

synapse/tests/test_lib_agenda.py

@@ -1098,6 +1098,15 @@ class AgendaTest(s_t_utils.SynTest):
                     self.gt(cdef00['laststarttime'], 0)
                     self.eq(cdef00['laststarttime'], cdef01['laststarttime'])
 
+    async def test_agenda_warnings(self):
+
+        async with self.getTestCore() as core:
+            with self.getAsyncLoggerStream('synapse.lib.agenda', 'issued warning: oh hai') as stream:
+                q = '$lib.warn("oh hai")'
+                msgs = await core.stormlist('cron.at --now $q', opts={'vars': {'q': q}})
+                self.stormHasNoWarnErr(msgs)
+                self.true(await stream.wait(timeout=6))
+
     async def test_agenda_graceful_promotion_with_running_cron(self):
 
         async with self.getTestAha() as aha:
@@ -1221,3 +1230,35 @@ class AgendaTest(s_t_utils.SynTest):
 
             crons = await core.callStorm('return($lib.cron.list())')
             self.len(1, crons)
+
+    async def test_agenda_lasterrs(self):
+
+        async with self.getTestCore() as core:
+
+            cdef = {
+                'iden': 'test',
+                'creator': core.auth.rootuser.iden,
+                'storm': '[ test:str=foo ]',
+                'reqs': {},
+                'incunit': s_tu.MINUTE,
+                'incvals': 1
+            }
+
+            await core.agenda.add(cdef)
+            appt = await core.agenda.get('test')
+
+            self.true(isinstance(appt.lasterrs, list))
+            self.eq(appt.lasterrs, [])
+
+            edits = {
+                'lasterrs': ('error1', 'error2'),
+            }
+            await appt.edits(edits)
+
+            self.true(isinstance(appt.lasterrs, list))
+            self.eq(appt.lasterrs, ['error1', 'error2'])
+
+            await core.agenda._load_all()
+            appt = await core.agenda.get('test')
+            self.true(isinstance(appt.lasterrs, list))
+            self.eq(appt.lasterrs, ['error1', 'error2'])

synapse/tests/test_lib_ast.py

@@ -1077,6 +1077,9 @@ class AstTest(s_test.SynTest):
             self.len(1, await core.nodes('inet:proto:request:sandbox:file'))
             self.len(1, await core.nodes('it:host:activity:sandbox:file'))
 
+            self.len(1, await core.nodes('[ it:exec:reg:get=* :host=(host,) ]'))
+            self.len(4, await core.nodes('it:host:activity:host=(host,)'))
+
     async def test_ast_edge_walknjoin(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_cell.py

@@ -1203,12 +1203,12 @@ class CellTest(s_t_utils.SynTest):
 
     async def test_cell_hiveapi(self):
 
-        async with self.getTestCore() as core:
+        async with self.getTestCell() as cell:
 
-            await core.setHiveKey(('foo', 'bar'), 10)
-            await core.setHiveKey(('foo', 'baz'), 30)
+            await cell.setHiveKey(('foo', 'bar'), 10)
+            await cell.setHiveKey(('foo', 'baz'), 30)
 
-            async with core.getLocalProxy() as proxy:
+            async with cell.getLocalProxy() as proxy:
                 self.eq((), await proxy.getHiveKeys(('lulz',)))
                 self.eq((('bar', 10), ('baz', 30)), await proxy.getHiveKeys(('foo',)))
 

synapse/tests/test_lib_hive.py

@@ -1,12 +1,8 @@
-import asyncio
-
 import synapse.exc as s_exc
 import synapse.common as s_common
 
 import synapse.tests.utils as s_test
 
-import synapse.lib.hive as s_hive
-
 tree0 = {
     'kids': {
         'hehe': {'value': 'haha'},
@@ -73,40 +69,6 @@ class HiveTest(s_test.SynTest):
 
                 self.none(await hive.get(('foo', 'bar', 'lulz')))
 
-    async def test_hive_telepath(self):
-
-        # confirm that the primitives used by higher level APIs
-        # work using telepath remotes and property synchronize.
-
-        async with self.getTestHiveDmon() as dmon:
-
-            turl = self.getTestUrl(dmon, 'hive')
-
-            async with await s_hive.openurl(turl) as hive0:
-
-                path = ('foo', 'bar')
-
-                evnt = asyncio.Event()
-
-                def onedit(mesg):
-                    evnt.set()
-
-                node0 = await hive0.open(path)
-                node0.on('hive:set', onedit)
-
-                async with await s_hive.openurl(turl) as hive1:
-
-                    node1 = await hive1.open(path)
-                    await node1.set(200)
-
-                    await evnt.wait()
-
-                    self.eq(200, node0.valu)
-
-                    self.eq(201, await node0.add(1))
-                    self.eq(202, await node1.add(1))
-                    self.eq(203, await node0.add(1))
-
     async def test_hive_dir(self):
 
         async with self.getTestHive() as hive:

synapse/tests/test_lib_storm.py

@@ -163,6 +163,10 @@ class StormTest(s_t_utils.SynTest):
             with self.raises(s_exc.BadTypeValu):
                 await core.nodes('inet:flow:from=({"name": "vertex", "type": "newp"})')
 
+            await core.nodes('[ ou:org=({"name": "origname"}) ]')
+            self.len(1, await core.nodes('ou:org=({"name": "origname"}) [ :name=newname ]'))
+            self.len(0, await core.nodes('ou:org=({"name": "origname"})'))
+
     async def test_lib_storm_jsonexpr(self):
         async with self.getTestCore() as core:
 
@@ -4121,6 +4125,9 @@ class StormTest(s_t_utils.SynTest):
                     {'name': 'woot', 'cmdinputs': (
                         {'form': 'hehe:haha'},
                         {'form': 'hoho:lol', 'help': 'We know whats up'}
+                    ), 'endpoints': (
+                        {'path': '/v1/test/one', 'desc': 'My multi-line endpoint description which spans multiple lines and has a second line. This is the second line of the description.'},
+                        {'path': '/v1/test/two', 'host': 'vertex.link', 'desc': 'Single line endpoint description.'},
                     )},
                 ),
             }
@@ -4128,6 +4135,9 @@ class StormTest(s_t_utils.SynTest):
             msgs = await core.stormlist('woot --help')
             helptext = '\n'.join([m[1].get('mesg') for m in msgs if m[0] == 'print'])
             self.isin('Inputs:\n\n    hehe:haha\n    hoho:lol  - We know whats up', helptext)
+            self.isin('Endpoints:\n\n    /v1/test/one              : My multi-line endpoint description which spans multiple lines and has a second line.', helptext)
+            self.isin('This is the second line of the description.', helptext)
+            self.isin('/v1/test/two              : Single line endpoint description.', helptext)
 
     async def test_storm_help_cmd(self):
 
@@ -5028,7 +5038,7 @@ class StormTest(s_t_utils.SynTest):
             q = '''
                 for $i in $lib.range(12) {[ test:str=$i ]}
 
-                batch $lib.true --size 5 {
+                batch $lib.true --size 5 ${
                     $vals=([])
                     for $n in $nodes { $vals.append($n.repr()) }
                     $lib.print($lib.str.join(',', $vals))

synapse/tests/test_model_risk.py

@@ -610,6 +610,10 @@ class RiskModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('risk:mitigation -> it:mitre:attack:mitigation'))
             self.len(1, await core.nodes('risk:mitigation -> risk:mitigation:type:taxonomy'))
 
+            nodes = await core.nodes('risk:mitigation:type:taxonomy=foo.bar [ :desc="foo that bars"]')
+            self.len(1, nodes)
+            self.eq('foo that bars', nodes[0].get('desc'))
+
     async def test_model_risk_tool_software(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_tools_autodoc.py

@@ -40,6 +40,11 @@ class TestAutoDoc(s_t_utils.SynTest):
             self.isin('+==========+', s)
             self.isin('+deprecated+', s)
 
+            self.isin('''This type implements the following interfaces:
+
+ * ``inet:service:object``
+ * ``phys:object``''', s)
+
             with s_common.genfile(path, 'datamodel_forms.rst') as fd:
                 buf = fd.read()
 

synapse/tests/test_tools_hiveload.py

@@ -37,8 +37,8 @@ class HiveLoadTest(s_test.SynTest):
             hivepath0 = os.path.join(dirn, 'hivesave0.mpk')
             s_msgpack.dumpfile(htree0, hivepath0)
 
-            async with self.getTestHiveDmon() as dmon:
-                hurl = self.getTestUrl(dmon, 'hive')
+            async with self.getTestCell() as cell:
+                hurl = cell.getLocalUrl()
 
                 argv = [hurl, hivepath0]
 
@@ -64,43 +64,39 @@ class HiveLoadTest(s_test.SynTest):
             s_msgpack.dumpfile(htree1, hivepath1)
             s_common.yamlsave(htree0, yamlpath0)
 
-            async with self.getTestHiveDmon() as dmon:
-
-                hive = dmon.shared.get('hive')
-                hurl = self.getTestUrl(dmon, 'hive')
+            async with self.getTestCell() as cell:
+                hurl = cell.getLocalUrl()
 
                 retn = await s_hiveload.main([hurl, hivepath0])
                 self.eq(0, retn)
 
-                self.eq(20, await hive.get(('hehe',)))
-                self.eq(30, await hive.get(('haha',)))
-                self.eq('bar', await hive.get(('haha', 'foo')))
-                self.eq('faz', await hive.get(('haha', 'baz')))
+                self.eq(20, await cell.hive.get(('hehe',)))
+                self.eq(30, await cell.hive.get(('haha',)))
+                self.eq('bar', await cell.hive.get(('haha', 'foo')))
+                self.eq('faz', await cell.hive.get(('haha', 'baz')))
 
                 retn = await s_hiveload.main([hurl, hivepath1])
                 self.eq(0, retn)
 
-                self.eq(20, await hive.get(('hehe',)))
-                self.eq(30, await hive.get(('haha',)))
-                self.eq('bar', await hive.get(('haha', 'foo')))
-                self.eq('faz', await hive.get(('haha', 'baz')))
+                self.eq(20, await cell.hive.get(('hehe',)))
+                self.eq(30, await cell.hive.get(('haha',)))
+                self.eq('bar', await cell.hive.get(('haha', 'foo')))
+                self.eq('faz', await cell.hive.get(('haha', 'baz')))
 
                 retn = await s_hiveload.main(['--trim', hurl, hivepath1])
                 self.eq(0, retn)
 
-                self.eq(20, await hive.get(('hehe',)))
-                self.eq(30, await hive.get(('haha',)))
-                self.eq('faz', await hive.get(('haha', 'baz')))
-
-                self.none(await hive.get(('haha', 'foo')))
+                self.eq(20, await cell.hive.get(('hehe',)))
+                self.eq(30, await cell.hive.get(('haha',)))
+                self.eq('faz', await cell.hive.get(('haha', 'baz')))
 
-            async with self.getTestHiveDmon() as dmon:
+                self.none(await cell.hive.get(('haha', 'foo')))
 
-                hive = dmon.shared.get('hive')
-                hurl = self.getTestUrl(dmon, 'hive')
+            async with self.getTestCell() as cell:
+                hurl = cell.getLocalUrl()
 
                 await s_hiveload.main(['--path', 'v/i/s/i', '--yaml', hurl, yamlpath0])
-                self.eq('bar', await hive.get(('v', 'i', 's', 'i', 'haha', 'foo')))
+                self.eq('bar', await cell.hive.get(('v', 'i', 's', 'i', 'haha', 'foo')))
 
             path = os.path.join(dirn, 'cell')
             async with await s_cell.Cell.anit(path) as cell:

synapse/tests/test_tools_hivesave.py

@@ -17,8 +17,8 @@ class HiveSaveTest(s_test.SynTest):
 
             hivepath0 = os.path.join(dirn, 'hivesave0.mpk')
 
-            async with self.getTestHiveDmon() as dmon:
-                hurl = self.getTestUrl(dmon, 'hive')
+            async with self.getTestCell() as cell:
+                hurl = cell.getLocalUrl()
 
                 argv = [hurl, hivepath0]
 
@@ -39,12 +39,10 @@ class HiveSaveTest(s_test.SynTest):
             hivepath0 = os.path.join(dirn, 'hivesave0.mpk')
             yamlpath0 = os.path.join(dirn, 'hivesave0.yaml')
 
-            async with self.getTestHiveDmon() as dmon:
+            async with self.getTestCell() as cell:
+                hurl = cell.getLocalUrl()
 
-                hive = dmon.shared.get('hive')
-                await hive.set(('baz', 'faz'), 'visi')
-
-                hurl = self.getTestUrl(dmon, 'hive')
+                await cell.hive.set(('baz', 'faz'), 'visi')
 
                 retn = await s_hivesave.main([hurl, hivepath0])
                 self.eq(0, retn)