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

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):
 
@@ -4724,6 +4724,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_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

@@ -3068,6 +3068,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 +3100,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 +3114,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

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_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'))
 

synapse/tests/{test_tools_csvtool.py → test_tools_cortex_csv.py}

@@ -5,7 +5,7 @@ import synapse.common as s_common
 
 import synapse.tests.utils as s_t_utils
 
-import synapse.tools.csvtool as s_csvtool
+import synapse.tools.cortex.csv as s_csvtool
 
 csvfile = b'''ipv4,fqdn,notes
 1.2.3.4,vertex.link,malware
@@ -76,7 +76,7 @@ class CsvToolTest(s_t_utils.SynTest):
             with mock.patch('synapse.telepath.Proxy._getSynVers', self._getOldSynVers):
                 outp = self.getTestOutp()
                 await s_csvtool.main(argv, outp=outp)
-                outp.expect('Cortex version 0.0.0 is outside of the csvtool supported range')
+                outp.expect('Cortex version 0.0.0 is outside of the synapse.tools.cortex.csv supported range')
 
             view = await core.callStorm('$view = $lib.view.get() $fork=$view.fork() return ( $fork.iden )')
 
@@ -107,6 +107,15 @@ class CsvToolTest(s_t_utils.SynTest):
             self.eq(0, await s_csvtool.main(argv, outp=outp))
             outp.expect("('err', ('BadSyntax")
 
+            q = '| |'  # raises a err
+            with s_common.genfile(stormpath) as fd:
+                fd.truncate()
+                fd.write(q.encode())
+            argv = ['--cortex', url, stormpath, csvpath]
+            outp = self.getTestOutp()
+            self.eq(0, await s_csvtool.main(argv, outp=outp))
+            outp.expect("('err', ('BadSyntax")
+
     async def test_csvtool_missingvals(self):
 
         async with self.getTestCore() as core:
@@ -225,7 +234,7 @@ class CsvToolTest(s_t_utils.SynTest):
             with mock.patch('synapse.telepath.Proxy._getSynVers', self._getOldSynVers):
                 outp = self.getTestOutp()
                 await s_csvtool.main(argv, outp=outp)
-                outp.expect(f'Cortex version 0.0.0 is outside of the csvtool supported range')
+                outp.expect(f'Cortex version 0.0.0 is outside of the synapse.tools.cortex.csv supported range')
 
             view = await core.callStorm('$view = $lib.view.get() $fork=$view.fork() return ( $fork.iden )')
             await core.nodes('[test:int=50]', opts={'view': view})

synapse/tests/{test_tools_feed.py → test_tools_cortex_feed.py}

@@ -8,7 +8,7 @@ import synapse.common as s_common
 import synapse.lib.json as s_json
 import synapse.lib.msgpack as s_msgpack
 
-import synapse.tools.feed as s_feed
+import synapse.tools.cortex.feed as s_feed
 
 import synapse.tests.utils as s_t_utils
 
@@ -49,7 +49,7 @@ class FeedTest(s_t_utils.SynTest):
 
             with mock.patch('synapse.telepath.Proxy._getSynVers', self._getOldSynVers):
                 await s_feed.main(argv, outp=outp)
-                outp.expect(f'Cortex version 0.0.0 is outside of the feed tool supported range')
+                outp.expect(f'Cortex version 0.0.0 is outside of the synapse.tools.cortex.feed supported range')
 
     async def test_synnodes_offset(self):
 

synapse/tests/{test_tools_apikey.py → test_tools_service_apikey.py}

@@ -1,13 +1,10 @@
-import datetime
-
-import synapse.exc as s_exc
 import synapse.common as s_common
 
 import synapse.lib.time as s_time
 import synapse.lib.output as s_output
 
 import synapse.tests.utils as s_test
-import synapse.tools.apikey as s_t_apikey
+import synapse.tools.service.apikey as s_t_apikey
 
 async def getApiKeyByName(core, name):
     keys = {k.get('name'): k async for k in core.getApiKeys()}

synapse/tests/{test_tools_backup.py → test_tools_service_backup.py}

@@ -5,7 +5,7 @@ import synapse.lib.lmdbslab as s_lmdbslab
 
 import synapse.tests.utils as s_t_utils
 
-import synapse.tools.backup as s_backup
+import synapse.tools.service.backup as s_backup
 
 class BackupTest(s_t_utils.SynTest):
 
@@ -61,7 +61,7 @@ class BackupTest(s_t_utils.SynTest):
 
                 argv = (core.dirn, dirn2)
 
-                self.eq(0, s_backup.main(argv))
+                self.eq(0, await s_backup.main(argv))
 
                 fpset = self.compare_dirs(core.dirn, dirn2, skipfns={'lock.mdb'}, skipdirs={'tmp'})
                 self.false(os.path.exists(s_common.genpath(dirn2, 'tmp')))
@@ -71,7 +71,7 @@ class BackupTest(s_t_utils.SynTest):
 
             # Test corner case no-lmdbinfo
             with self.getTestDir() as dirn2:
-                with self.getLoggerStream('synapse.tools.backup') as stream:
+                with self.getLoggerStream('synapse.tools.service.backup') as stream:
                     s_backup.txnbackup({}, core.dirn, dirn2)
                     stream.seek(0)
                     self.isin('not copied', stream.read())
@@ -90,7 +90,7 @@ class BackupTest(s_t_utils.SynTest):
                     '--skipdirs', '**/nodeedits.lmdb', './axon',
                 )
 
-                self.eq(0, s_backup.main(argv))
+                self.eq(0, await s_backup.main(argv))
 
                 skipdirs = {'tmp', 'nodeedits.lmdb', 'axon'}
                 fpset = self.compare_dirs(core.dirn, dirn2, skipfns={'lock.mdb'}, skipdirs=skipdirs)
@@ -110,7 +110,7 @@ class BackupTest(s_t_utils.SynTest):
                     '--skipdirs', 'layers/*',
                 )
 
-                self.eq(0, s_backup.main(argv))
+                self.eq(0, await s_backup.main(argv))
 
                 fpset = self.compare_dirs(core.dirn, dirn2, skipfns={'lock.mdb'}, skipdirs={'tmp', layriden})
 

synapse/tests/{test_tools_demote.py → test_tools_service_demote.py}

@@ -5,7 +5,7 @@ import synapse.common as s_common
 
 import synapse.lib.cell as s_cell
 
-import synapse.tools.demote as s_tools_demote
+import synapse.tools.service.demote as s_tools_demote
 
 import synapse.tests.utils as s_test
 

synapse/tests/{test_tools_healthcheck.py → test_tools_service_healthcheck.py}

@@ -7,7 +7,7 @@ import synapse.lib.json as s_json
 
 import synapse.tests.utils as s_t_utils
 
-import synapse.tools.healthcheck as s_t_healthcheck
+import synapse.tools.service.healthcheck as s_t_healthcheck
 
 logger = logging.getLogger(__name__)
 

synapse/tests/{test_tools_livebackup.py → test_tools_service_livebackup.py}

@@ -4,7 +4,7 @@ import synapse.common as s_common
 
 import synapse.lib.output as s_output
 import synapse.tests.utils as s_test
-import synapse.tools.livebackup as s_t_livebackup
+import synapse.tools.service.livebackup as s_t_livebackup
 
 class LivebackupTest(s_test.SynTest):
 

synapse/tests/{test_tools_modrole.py → test_tools_service_modrole.py}

@@ -1,6 +1,6 @@
 import synapse.lib.output as s_output
 import synapse.tests.utils as s_test
-import synapse.tools.modrole as s_t_modrole
+import synapse.tools.service.modrole as s_t_modrole
 
 rolelist = s_test.deguidify('''
 Roles:

synapse/tests/{test_tools_moduser.py → test_tools_service_moduser.py}

@@ -1,6 +1,6 @@
 import synapse.lib.output as s_output
 import synapse.tests.utils as s_test
-import synapse.tools.moduser as s_t_moduser
+import synapse.tools.service.moduser as s_t_moduser
 
 userlist = '''
 Users:

synapse/tests/{test_tools_promote.py → test_tools_service_promote.py}

@@ -3,7 +3,7 @@ import synapse.common as s_common
 import synapse.lib.base as s_base
 import synapse.lib.cell as s_cell
 
-import synapse.tools.promote as s_tools_promote
+import synapse.tools.service.promote as s_tools_promote
 
 import synapse.tests.utils as s_t_utils
 

synapse/tests/{test_tools_reload.py → test_tools_service_reload.py}

@@ -1,4 +1,4 @@
-import synapse.tools.reload as s_t_reload
+import synapse.tools.service.reload as s_t_reload
 
 import synapse.tests.utils as s_test
 

synapse/tests/{test_tools_shutdown.py → test_tools_service_shutdown.py}

@@ -4,7 +4,7 @@ import synapse.lib.cell as s_cell
 
 
 import synapse.tests.utils as s_test
-import synapse.tools.shutdown as s_t_shutdown
+import synapse.tools.service.shutdown as s_t_shutdown
 
 class ShutdownToolTest(s_test.SynTest):
 

synapse/tests/{test_tools_snapshot.py → test_tools_service_snapshot.py}

@@ -1,7 +1,7 @@
 from unittest import mock
 
 import synapse.lib.output as s_output
-import synapse.tools.snapshot as s_tools_snapshot
+import synapse.tools.service.snapshot as s_tools_snapshot
 
 import synapse.tests.utils as s_t_utils
 

synapse/tests/{test_tools_storm.py → test_tools_storm_cli.py}

@@ -16,7 +16,7 @@ import synapse.telepath as s_telepath
 import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.msgpack as s_msgpack
-import synapse.tools.storm as s_t_storm
+import synapse.tools.storm._cli as s_t_storm
 
 def run_cli_till_print(url, evt1):
     '''

synapse/tests/{test_tools_pkgs_gendocs.py → test_tools_storm_pkg_doc.py}

@@ -2,14 +2,15 @@ import io
 import os
 import sys
 import json
+import unittest.mock as mock
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 
 import synapse.tests.utils as s_t_utils
 
-import synapse.tools.pkgs.gendocs as s_t_gendocs
-import synapse.tools.pkgs.pandoc_filter as s_t_pandoc_filter
+import synapse.tools.storm.pkg.doc as s_t_gendocs
+import synapse.tools.storm.pkg._pandoc_filter as s_t_pandoc_filter
 
 class TestPkgBuildDocs(s_t_utils.SynTest):
 
@@ -18,7 +19,7 @@ class TestPkgBuildDocs(s_t_utils.SynTest):
             self.skip('pandoc is not available')
         super().setUp()
 
-    async def test_pkg_builddocs(self):
+    async def test_storm_pkg_doc_base(self):
 
         with self.getTestDir(mirror='testpkg_build_docs') as dirn:
             testpkgfp = os.path.join(dirn, 'testpkg.yaml')
@@ -98,3 +99,11 @@ class TestPkgBuildDocs(s_t_utils.SynTest):
                 outp.expect('ERR: Error running filter')
             finally:
                 s_t_gendocs.PANDOC_FILTER = oldv
+
+            # Pandoc is missing
+            def nopandoc(*args, **kwargs):
+                return 1
+
+            with mock.patch('os.system', new=nopandoc):
+                argv = [testpkgfp, ]
+                self.eq(1, await s_t_gendocs.main(argv))

synapse/tests/{test_tools_genpkg.py → test_tools_storm_pkg_gen.py}

@@ -9,7 +9,7 @@ import synapse.lib.version as s_version
 import synapse.tests.utils as s_test
 import synapse.tests.files as s_files
 
-import synapse.tools.genpkg as s_genpkg
+import synapse.tools.storm.pkg.gen as s_genpkg
 
 dirname = os.path.dirname(__file__)
 

synapse/tests/{test_tools_autodoc.py → test_tools_utils_autodoc.py}

@@ -5,7 +5,7 @@ import synapse.tests.utils as s_t_utils
 
 import synapse.lib.autodoc as s_l_autodoc
 
-import synapse.tools.autodoc as s_autodoc
+import synapse.tools.utils.autodoc as s_autodoc
 
 class TestAutoDoc(s_t_utils.SynTest):