synapse 2.224.0__py311-none-any.whl → 2.226.0__py311-none-any.whl

synapse/tests/test_lib_nexus.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 from unittest import mock
 
 import synapse.exc as s_exc
@@ -61,7 +62,7 @@ class SampleNexus2(SampleNexus, SampleMixin):
 
 class NexusTest(s_t_utils.SynTest):
 
-    async def test_nexus(self):
+    async def test_nexus_base(self):
 
         with self.getTestDir() as dirn:
             dir1 = s_common.genpath(dirn, 'nexus1')
@@ -111,6 +112,19 @@ class NexusTest(s_t_utils.SynTest):
                     stream.seek(0)
                     self.isin('while replaying log', stream.read())
 
+                    nexsindx = nexus1.nexsroot.nexslog.index()
+
+                    async def listen():
+                        async for item in nexus1.getNexusChanges(nexsindx, wait=True):
+                            break
+                        return item
+
+                    task = nexus1.schedCoro(listen())
+                    self.eq('foo', await nexus1.doathing(eventdict))
+                    offs, item = await asyncio.wait_for(task, timeout=12)
+                    self.eq(offs, nexsindx)
+                    self.eq(item[1], 'thing:doathing')
+
     async def test_nexus_modroot(self):
 
         async with self.getTestCell() as cell:
@@ -395,3 +409,30 @@ class NexusTest(s_t_utils.SynTest):
                 await core.nodes('[ it:dev:str=foo ]', opts={'view': forkiden})
 
             core.nexsroot._nexskids[layriden] = layr
+
+    async def test_nexus_iter(self):
+        async with self.getTestCell(conf={'nexslog:en': True}) as cell:
+            await cell.sync()
+
+            # Force nexus events to be added while constructing a Window
+            orig = s_nexus.NexsRoot.getMirrorWindow
+
+            @contextlib.asynccontextmanager
+            async def slowwindow(self):
+                await cell.sync()
+                async with orig(self) as wind:
+                    await cell.sync()
+                    yield wind
+
+            items = []
+            with mock.patch('synapse.lib.nexus.NexsRoot.getMirrorWindow', slowwindow):
+                async with cell.getLocalProxy() as prox:
+                    async for indx, item in prox.getNexusChanges(0):
+                        items.append(indx)
+                        if indx == 2:
+                            await cell.sync()
+                        elif indx == 3:
+                            break
+
+            # We didn't miss or duplicate items added during window construction
+            self.eq([0, 1, 2, 3], items)

synapse/tests/test_lib_platforms_linux.py

@@ -60,3 +60,7 @@ class LinuxTest(s_t_utils.SynTest):
         self.isinstance(ret, dict)
         self.isin('vm.swappiness', ret)
         self.isinstance(ret['vm.swappiness'], int)
+        self.isin('vm.dirty_bytes', ret)
+        self.isinstance(ret['vm.dirty_bytes'], int)
+        self.isin('vm.dirty_background_bytes', ret)
+        self.isinstance(ret['vm.dirty_background_bytes'], int)

synapse/tests/test_lib_slabseqn.py

@@ -15,7 +15,7 @@ class SlabSeqn(s_t_utils.SynTest):
     def chk_size(self, seqn):
         self.eq(seqn.stat()['entries'], seqn.size)
 
-    async def test_slab_seqn(self):
+    async def test_slab_seqn_base(self):
 
         with self.getTestDir() as dirn:
 
@@ -174,3 +174,32 @@ class SlabSeqn(s_t_utils.SynTest):
 
                 res = await asyncio.wait_for(genr.__anext__(), timeout=1)
                 self.eq((1, 'bar'), res)
+
+    async def test_slab_seqn_retnpack(self):
+
+        with self.getTestDir() as dirn:
+            async with await s_lmdbslab.Slab.anit(dirn, map_size=10_0000) as slab:
+
+                seqn = s_slabseqn.SlabSeqn(slab, 'seqn:test')
+
+                self.eq((0, b'\xa4foo1'), seqn.addWithPackRetn('foo1'))
+                self.eq((1, b'\xa4foo2'), seqn.addWithPackRetn('foo2'))
+                self.eq((0, b'\xa4foo3'), seqn.addWithPackRetn('foo3', indx=0))
+
+                seqn.addWithPackRetn('foo4', indx=10)
+                seqn.addWithPackRetn('foo5')
+                seqn.addWithPackRetn('foo6', indx=7)
+                seqn.addWithPackRetn('foo7', indx=7)
+
+                self.eq((12, b'\xa4foo8'), seqn.addWithPackRetn('foo8'))
+
+                valus = [valu for valu in seqn.iter(0)]
+                evals = [
+                    (0, 'foo3',),
+                    (1, 'foo2'),
+                    (7, 'foo7'),
+                    (10, 'foo4'),
+                    (11, 'foo5'),
+                    (12, 'foo8'),
+                ]
+                self.eq(valus, evals)

synapse/tests/test_lib_storm.py

@@ -21,7 +21,7 @@ import synapse.lib.stormtypes as s_stormtypes
 import synapse.tests.utils as s_t_utils
 from synapse.tests.utils import alist
 
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 class StormTest(s_t_utils.SynTest):
 
@@ -1095,6 +1095,9 @@ class StormTest(s_t_utils.SynTest):
 
             await visi.addRule((True, ('storm', 'asroot', 'cmd', 'asroot', 'yep')))
 
+            msgs = await core.stormlist('asroot.yep', opts=opts)
+            self.stormIsInWarn('Command (asroot.yep) requires asroot permission which is deprecated', msgs)
+
             nodes = await core.nodes('asroot.yep', opts=opts)
             self.len(1, nodes)
             self.eq('false', nodes[0].ndef[1])
@@ -1184,6 +1187,9 @@ class StormTest(s_t_utils.SynTest):
             await visi.addRule((True, ('storm', 'asroot', 'mod', 'foo')))
             self.len(1, await core.nodes('yield $lib.import(foo.baz).lol()', opts=opts))
 
+            msgs = await core.stormlist('$lib.import(foo.bar)')
+            self.stormIsInWarn('Module (foo.bar) requires asroot permission but does not specify any asroot:perms', msgs)
+
             # coverage for dyncall/dyniter with asroot...
             await core.nodes('$lib.import(foo.bar).dyncall()', opts=opts)
             await core.nodes('$lib.import(foo.bar).dyniter()', opts=opts)
@@ -4724,6 +4730,64 @@ class StormTest(s_t_utils.SynTest):
             self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
             self.len(2, [m for m in msgs if m[0] == 'warn'])
 
+    async def test_storm_cmd_cmdconf(self):
+        pkgdef = {
+            'name': 'testpkg',
+            'version': '1.0.0',
+            'commands': [
+                {
+                    'name': 'getcmdconf',
+                    'cmdconf': {
+                        'valu': 0,
+                        'sub': {
+                            'valu': 0,
+                        },
+                    },
+                    'storm': '''
+                        $lib.print(`VALU: {$cmdconf.valu}.`)
+                        $lib.print(`SUBVALU: {$cmdconf.sub.valu}.`)
+                        $cmdconf.valu = ($cmdconf.valu + 1)
+                        $cmdconf.sub.valu = ($cmdconf.sub.valu + 1)
+                    ''',
+                },
+            ],
+        }
+
+        async with self.getTestCore() as core:
+            await core.addStormPkg(pkgdef)
+
+            msgs = await core.stormlist('getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+
+            msgs = await core.stormlist('getcmdconf | getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            msgs = [k for k in msgs if k[0] == 'print']
+            self.len(4, msgs)
+            self.sorteq(
+                ['VALU: 0.', 'VALU: 0.', 'SUBVALU: 0.', 'SUBVALU: 0.'],
+                [msg[1].get('mesg') for msg in msgs]
+            )
+
+            msgs = await core.stormlist('for $i in $lib.range(16) {[test:int=$i]} | getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('VALU: 1.', msgs)
+            self.stormIsInPrint('VALU: 15.', msgs)
+            self.stormNotInPrint('VALU: 16.', msgs)
+
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 1.', msgs)
+            self.stormIsInPrint('SUBVALU: 15.', msgs)
+            self.stormNotInPrint('SUBVALU: 16.', msgs)
+
+            msgs = await core.stormlist('getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+
     async def test_liftby_edge(self):
         async with self.getTestCore() as core:
 

synapse/tests/test_lib_stormhttp.py

@@ -47,6 +47,11 @@ class HttpBadJson(s_httpapi.Handler):
     async def get(self):
         self.write(b'{"foo": "bar\x80"}')
 
+class HttpGiantHeader(s_httpapi.Handler):
+    async def get(self):
+        self.set_header('Giant', 'x' * 64_000)
+        self.write('test')
+
 class StormHttpTest(s_test.SynTest):
 
     async def test_storm_http_get(self):
@@ -60,6 +65,7 @@ class StormHttpTest(s_test.SynTest):
             core.addHttpApi('/api/v0/test', s_test.HttpReflector, {'cell': core})
             core.addHttpApi('/api/v0/notjson', HttpNotJson, {'cell': core})
             core.addHttpApi('/api/v0/badjson', HttpBadJson, {'cell': core})
+            core.addHttpApi('/api/v0/giantheader', HttpGiantHeader, {'cell': core})
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             status_url = f'https://127.0.0.1:{port}/api/v1/status'
             opts = {'vars': {'url': url, 'port': port, 'status_url': status_url}}
@@ -273,6 +279,16 @@ class StormHttpTest(s_test.SynTest):
             self.isinstance(resp, tuple)
             self.len(0, resp)
 
+            gianturl = f'https://root:root@127.0.0.1:{port}/api/v0/giantheader'
+            giantopts = {'vars': {'url': gianturl}}
+            q = '''
+            $resp = $lib.inet.http.get($url, ssl_verify=$lib.false)
+            return ( $resp )
+            '''
+            resp = await core.callStorm(q, opts=giantopts)
+            self.eq(resp['body'], b'test')
+            self.len(64_000, resp['headers'].get('Giant'))
+
     async def test_storm_http_inject_ca(self):
 
         with self.getTestDir() as dirn:

synapse/tests/test_lib_stormlib_aha.py

@@ -341,13 +341,13 @@ Connection information:
 
                 async def mockCellInfo():
                     return {
-                        'cell': {'ready': True, 'nexsindx': 10, 'uplink': None},
+                        'cell': {'ready': True, 'nexsindx': 10, 'active': True},
                         'synapse': {'verstring': '2.190.0'},
                     }
 
                 async def mockOutOfSyncCellInfo():
                     return {
-                        'cell': {'ready': True, 'nexsindx': 5, 'uplink': cell00.iden},
+                        'cell': {'ready': True, 'nexsindx': 5, 'active': False},
                         'synapse': {'verstring': '2.190.0'},
                     }
 
@@ -378,6 +378,10 @@ Connection information:
                         msgs = await core00.stormlist('aha.svc.mirror --timeout 1')
                         self.stormIsInPrint('Group Status: Out of Sync', msgs)
 
+                await cell01.nexsroot.client.fini()
+                msgs = await core00.stormlist('aha.svc.mirror')
+                self.stormIsInPrint('follower', msgs)
+
                 await aha.delAhaSvc('00.cell', network='synapse')
                 msgs = await core00.stormlist('aha.svc.mirror')
                 self.stormNotInPrint('Service Mirror Groups:', msgs)

synapse/tests/test_lib_stormlib_oauth.py

@@ -11,7 +11,7 @@ import synapse.lib.coro as s_coro
 import synapse.lib.oauth as s_oauth
 import synapse.lib.httpapi as s_httpapi
 import synapse.tests.utils as s_test
-import synapse.tools.backup as s_backup
+import synapse.tools.service.backup as s_backup
 
 logger = logging.getLogger(__name__)
 

synapse/tests/test_lib_stormsvc.py

@@ -9,7 +9,7 @@ import synapse.lib.cell as s_cell
 import synapse.lib.share as s_share
 import synapse.lib.stormsvc as s_stormsvc
 
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 old_pkg = {
     'name': 'old',

synapse/tests/test_lib_trigger.py

@@ -4,7 +4,7 @@ import synapse.common as s_common
 
 import synapse.telepath as s_telepath
 import synapse.tests.utils as s_t_utils
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 class TrigTest(s_t_utils.SynTest):
 

synapse/tests/test_model_inet.py

@@ -2999,17 +2999,21 @@ class InetModelTest(s_t_utils.SynTest):
                 :names=("slack chat",)
                 :parent={[ inet:service:platform=({"name": "salesforce"}) ]}
                 :status=available
+                :family="  FooFam  "
                 :period=(2022, 2023)
                 :creator={[ inet:service:account=({"id": "bar"}) ]}
                 :remover={[ inet:service:account=({"id": "baz"}) ]}
                 :provider={ ou:org:name=$provname }
                 :provider:name=$provname
+                :type=foo.bar
             ]
             '''
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('inet:service:platform', s_common.guid(('slack',))))
             self.eq('foo', nodes[0].get('id'))
+            self.eq('foo.bar.', nodes[0].get('type'))
+            self.eq('foofam', nodes[0].get('family'))
             self.eq(nodes[0].get('url'), 'https://slack.com')
             self.eq(nodes[0].get('urls'), ('https://slacker.com',))
             self.eq(nodes[0].get('zones'), ('slack.com', 'slacker.com'))
@@ -3039,6 +3043,9 @@ class InetModelTest(s_t_utils.SynTest):
             nodes = await core.nodes('[ inet:service:platform=({"zone": "slacker.com"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
+            nodes = await core.nodes('inet:service:platform:type:taxonomy')
+            self.sorteq(['foo.', 'foo.bar.'], [n.ndef[1] for n in nodes])
+
             q = '''
             [ inet:service:instance=(vertex, slack)
                 :id='T2XK1223Y'
@@ -3068,6 +3075,7 @@ class InetModelTest(s_t_utils.SynTest):
                 (inet:service:account=(blackout, account, vertex, slack)
                     :id=U7RN51U1J
                     :user=blackout
+                    :users=(zeblackout, blackoutalt, zeblackout)
                     :url=https://vertex.link/users/blackout
                     :email=blackout@vertex.link
                     :profile={ gen.ps.contact.email vertex.employee blackout@vertex.link }
@@ -3099,6 +3107,7 @@ class InetModelTest(s_t_utils.SynTest):
             self.eq(accounts[0].ndef, ('inet:service:account', s_common.guid(('blackout', 'account', 'vertex', 'slack'))))
             self.eq(accounts[0].get('id'), 'U7RN51U1J')
             self.eq(accounts[0].get('user'), 'blackout')
+            self.eq(accounts[0].get('users'), ('blackoutalt', 'zeblackout'))
             self.eq(accounts[0].get('url'), 'https://vertex.link/users/blackout')
             self.eq(accounts[0].get('email'), 'blackout@vertex.link')
             self.eq(accounts[0].get('profile'), blckprof.ndef[1])
@@ -3112,6 +3121,10 @@ class InetModelTest(s_t_utils.SynTest):
 
             self.len(1, await core.nodes('inet:service:account:email=visi@vertex.link :parent -> inet:service:account'))
 
+            nodes = await core.nodes('[ inet:service:account=({"user": "blackoutalt"}) ]')
+            self.len(1, nodes)
+            self.eq(accounts[0].ndef, nodes[0].ndef)
+
             q = '''
             [ inet:service:group=(developers, group, vertex, slack)
                 :id=X1234
@@ -3187,6 +3200,7 @@ class InetModelTest(s_t_utils.SynTest):
             q = '''
             [ inet:service:login=*
                 :method=password
+                :url=https://vertex.link/api/v1/login
                 :session=$blcksess
                 :server=tcp://10.10.10.4:443
                 :client=tcp://192.168.0.10:12345
@@ -3196,6 +3210,7 @@ class InetModelTest(s_t_utils.SynTest):
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].get('method'), 'password.')
+            self.eq(nodes[0].get('url'), 'https://vertex.link/api/v1/login')
 
             server = await core.nodes('inet:server=tcp://10.10.10.4:443')
             self.len(1, server)
@@ -3555,6 +3570,28 @@ class InetModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('inet:service:subscription :pay:instrument -> econ:bank:account'))
             self.len(1, await core.nodes('inet:service:subscription :subscriber -> inet:service:tenant'))
 
+            nodes = await core.nodes('''
+                [ inet:service:agent=*
+                    :name=woot
+                    :names=(foo, bar)
+                    :desc="Foo Bar"
+                    :software={[ it:prod:softver=(hehe, haha) ]}
+                    :platform={inet:service:platform | limit 1}
+
+                    // ensure we got the interface...
+                    :creator={ inet:service:account | limit 1 }
+                ]
+            ''')
+            self.len(1, nodes)
+            self.eq(nodes[0].get('name'), 'woot')
+            self.eq(nodes[0].get('names'), ('bar', 'foo'))
+            self.eq(nodes[0].get('desc'), 'Foo Bar')
+            self.nn(nodes[0].get('creator'))
+            self.nn(nodes[0].get('platform'))
+
+            self.len(1, await core.nodes('inet:service:action | limit 1 | [ :agent={ inet:service:agent } ]'))
+            self.len(1, await core.nodes('inet:service:platform | limit 1 | [ :software={[ it:prod:softver=(hehe, haha) ]} ]'))
+
     async def test_model_inet_tls_ja4(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_infotech.py

@@ -2163,6 +2163,20 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.eq(node.get('url'),
                     'https://github.com/vertexproject/synapse/commit/03c71e723bceedb38ef8fc14543c30b9e82e64cf')
 
+            nodes = await core.nodes('''
+                [ it:dev:repo:entry=*
+                    :repo={it:dev:repo | limit 1}
+                    :file=*
+                    :path=foo/bar/baz.exe
+                    <(has)+ { it:dev:repo:commit | limit 1 }
+                ]
+            ''')
+            self.nn(nodes[0].get('file'))
+            self.nn(nodes[0].get('repo'))
+            self.eq(nodes[0].get('path'), 'foo/bar/baz.exe')
+
+            self.len(1, await core.nodes('it:dev:repo:entry <(has)- it:dev:repo:commit'))
+
             props = {
                 'commit': commit,
                 'file': file,
@@ -2306,7 +2320,7 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.len(2, nodes)
 
             nodes = await core.nodes('it:dev:repo <- *')
-            self.len(4, nodes)
+            self.len(5, nodes)
 
             nodes = await core.nodes('it:dev:repo:commit')
             self.len(3, nodes)

synapse/tests/test_model_media.py

@@ -22,6 +22,7 @@ class MediaModelTest(s_t_utils.SynTest):
                 'file': file0,
                 'title': 'Synapse is awesome! ',
                 'summary': 'I forget ',
+                'body': 'It is Awesome ',
                 'published': 0,
                 'updated': 0,
                 'org': 'verteX',
@@ -34,7 +35,7 @@ class MediaModelTest(s_t_utils.SynTest):
 
             q = '''[(media:news=$valu
                     :url=$p.url :file=$p.file :title=$p.title
-                    :summary=$p.summary :published=$p.published :updated=$p.updated
+                    :summary=$p.summary :body=$p.body :published=$p.published :updated=$p.updated
                     :org=$p.org :authors=$p.authors
                     :publisher=$p.publisher :publisher:name=$p."publisher:name"
                     :rss:feed=$p."rss:feed" :topics=$p.topics
@@ -49,6 +50,8 @@ class MediaModelTest(s_t_utils.SynTest):
             self.eq(node.get('url:fqdn'), 'vertex.link')
             self.eq(node.get('file'), 'sha256:' + file0)
             self.eq(node.get('title'), 'synapse is awesome! ')
+            self.eq(node.get('summary'), 'I forget ')
+            self.eq(node.get('body'), 'It is Awesome ')
             self.eq(node.get('published'), 0)
             self.eq(node.get('updated'), 0)
             self.eq(node.get('publisher'), publisher)

synapse/tests/test_model_risk.py

@@ -601,6 +601,7 @@ class RiskModelTest(s_t_utils.SynTest):
                 risk:mitigation=*
                     :vuln=*
                     :name="  FooBar  "
+                    :id="  IDa123  "
                     :type=foo.bar
                     :desc=BazFaz
                     :hardware=*
@@ -613,6 +614,7 @@ class RiskModelTest(s_t_utils.SynTest):
             self.eq('BazFaz', nodes[0].props['desc'])
             self.eq('vertex', nodes[0].get('reporter:name'))
             self.eq('foo.bar.', nodes[0].get('type'))
+            self.eq('IDa123', nodes[0].get('id'))
             self.nn(nodes[0].get('reporter'))
             self.len(1, await core.nodes('risk:mitigation -> risk:vuln'))
             self.len(1, await core.nodes('risk:mitigation -> it:prod:softver'))

synapse/tests/test_tools_aha.py

@@ -273,13 +273,13 @@ class AhaToolsTest(s_t_utils.SynTest):
 
             async def mockCellInfo():
                 return {
-                    'cell': {'ready': True, 'nexsindx': 10, 'uplink': None},
+                    'cell': {'ready': True, 'nexsindx': 10, 'active': True},
                     'synapse': {'verstring': s_version.verstring},
                 }
 
             async def mockOutOfSyncCellInfo():
                 return {
-                    'cell': {'ready': True, 'nexsindx': 5, 'uplink': cell00.iden},
+                    'cell': {'ready': True, 'nexsindx': 5, 'active': False},
                     'synapse': {'verstring': s_version.verstring},
                 }
 

synapse/tests/{test_tools_axon2axon.py → test_tools_axon_copy.py}

@@ -1,5 +1,5 @@
 import synapse.tests.utils as s_test
-import synapse.tools.axon2axon as s_axon2axon
+import synapse.tools.axon.copy as s_copy
 
 class Axon2AxonTest(s_test.SynTest):
 
@@ -15,7 +15,7 @@ class Axon2AxonTest(s_test.SynTest):
                 (size, sha256) = await srcaxon.put(b'visi')
 
                 outp = self.getTestOutp()
-                await s_axon2axon.main([srcurl, dsturl], outp=outp)
+                await s_copy.main([srcurl, dsturl], outp=outp)
                 self.true(await dstaxon.has(sha256))
                 outp.expect('Starting transfer at offset: 0')
                 outp.expect('[         0] - e45bbb7e03acacf4d1cca4c16af1ec0c51d777d10e53ed3155bd3d8deb398f3f (4)')
@@ -23,11 +23,11 @@ class Axon2AxonTest(s_test.SynTest):
                 (size, sha256) = await srcaxon.put(b'vertex')
 
                 outp = self.getTestOutp()
-                await s_axon2axon.main([srcurl, dsturl, '--offset', '1'], outp=outp)
+                await s_copy.main([srcurl, dsturl, '--offset', '1'], outp=outp)
                 self.true(await dstaxon.has(sha256))
                 outp.expect('Starting transfer at offset: 1')
                 outp.expect('[         1] - e1b683e26a3aad218df6aa63afe9cf57fdb5dfaf5eb20cddac14305d67f48a02 (6)')
 
                 outp = self.getTestOutp()
-                self.eq(1, await s_axon2axon.main([], outp=outp))
+                self.eq(1, await s_copy.main([], outp=outp))
                 outp.expect('arguments are required:')

synapse/tests/{test_tools_pullfile.py → test_tools_axon_get.py}

@@ -5,7 +5,7 @@ import pathlib
 from unittest import mock
 
 import synapse.tests.utils as s_t_utils
-import synapse.tools.pullfile as s_pullfile
+import synapse.tools.axon.get as s_get
 
 class TestPullFile(s_t_utils.SynTest):
 
@@ -30,13 +30,13 @@ class TestPullFile(s_t_utils.SynTest):
             with self.getTestDir() as wdir:
 
                 outp = self.getTestOutp()
-                self.eq(0, await s_pullfile.main(['-a', axonurl,
+                self.eq(0, await s_get.main(['-a', axonurl,
                                             '-o', wdir,
                                             '-l', testhash,
                                             '-l', nonehash], outp))
                 oldcwd = os.getcwd()
                 os.chdir(wdir)
-                self.eq(0, await s_pullfile.main(['-a', axonurl,
+                self.eq(0, await s_get.main(['-a', axonurl,
                                             '-l', visihash], outp))
 
                 os.chdir(oldcwd)
@@ -52,6 +52,6 @@ class TestPullFile(s_t_utils.SynTest):
                 self.true(outp.expect(f'Fetching {visihash} to file'))
 
                 with mock.patch('synapse.axon.Axon.get', self._getFail):
-                    self.eq(0, await s_pullfile.main(['-a', axonurl,
+                    self.eq(0, await s_get.main(['-a', axonurl,
                                                 '-l', visihash], outp))
                     self.isin('Error: Hit Exception', str(outp))

synapse/tests/{test_tools_pushfile.py → test_tools_axon_put.py}

@@ -3,7 +3,7 @@ import hashlib
 
 import synapse.common as s_common
 
-import synapse.tools.pushfile as s_pushfile
+import synapse.tools.axon.put as s_put
 
 import synapse.tests.utils as s_t_utils
 
@@ -43,7 +43,7 @@ class TestPushFile(s_t_utils.SynTest):
                                     '-t', 'foo.bar,baz.faz',
                                     visipath]
 
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
                             self.true(outp.expect('Uploaded [visi.txt] to axon'))
                             self.true(outp.expect('file: visi.txt (4) added to core'))
 
@@ -51,7 +51,7 @@ class TestPushFile(s_t_utils.SynTest):
                             self.eq(b'visi', b''.join([buf async for buf in axonprox.get(visihash)]))
 
                             outp = self.getTestOutp()
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
                             self.true(outp.expect('Axon already had [visi.txt]'))
 
                             self.eq(1, await coreprox.count(f'file:bytes={s_common.ehex(visihash)}'))
@@ -63,7 +63,7 @@ class TestPushFile(s_t_utils.SynTest):
                             args = ['-a', axonurl, nullpath]
 
                             outp = self.getTestOutp()
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
                             self.true(outp.expect(f'filepath does not contain any files: {nullpath}'))
 
                             self.len(1, await axonprox.wants([nullhash]))
@@ -77,7 +77,7 @@ class TestPushFile(s_t_utils.SynTest):
                                     '-t', 'empty',
                                     nullpath]
 
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
 
                             self.len(0, await axonprox.wants([nullhash]))
                             self.eq(b'', b''.join([buf async for buf in axonprox.get(nullhash)]))
@@ -100,7 +100,7 @@ class TestPushFile(s_t_utils.SynTest):
                                     '-t', 'beef',
                                     f'{dirn}/**']
 
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
                             self.true(outp.expect('Uploaded [bar.txt] to axon'))
                             self.true(outp.expect('file: bar.txt (3) added to core'))
 
@@ -119,7 +119,7 @@ class TestPushFile(s_t_utils.SynTest):
                                     '-r',
                                     f'{dirn}/**']
 
-                            self.eq(0, await s_pushfile.main(args, outp))
+                            self.eq(0, await s_put.main(args, outp))
                             self.true(outp.expect('Uploaded [foo.txt] to axon'))
                             self.true(outp.expect('file: foo.txt (3) added to core'))