synapse 2.177.0__py311-none-any.whl → 2.178.0__py311-none-any.whl

synapse/tests/test_lib_base.py

@@ -60,6 +60,21 @@ class BaseTest(s_t_utils.SynTest):
         event = await base.fire('woot', x=3, y=5, ret=[])
         self.eq(event[1]['ret'], 8)
 
+        base00 = await s_base.Base.anit()
+        base01 = await s_base.Base.anit()
+        data = {}
+        async def onfini():
+            data['woot'] = True
+
+        await base00.fini()
+        base00.onfini(onfini)
+        await asyncio.sleep(0)
+        self.true(data.get('woot'))
+
+        base00.onfini(base01)
+        await asyncio.sleep(0)
+        self.true(base01.isfini)
+
     async def test_base_anit(self):
 
         afoo = await Hehe.anit(20)
@@ -201,6 +216,7 @@ class BaseTest(s_t_utils.SynTest):
         self.eq(data['count'], 1)
 
     async def test_base_waiter(self):
+
         base0 = await s_base.Base.anit()
 
         wait0 = base0.waiter(3, 'foo:bar')
@@ -224,6 +240,10 @@ class BaseTest(s_t_utils.SynTest):
         evts = await wait2.wait(1)
         self.len(2, evts)
 
+        with self.raises(s_exc.TimeOut):
+            async with base0.waiter(1, 'newp', 'nuuh', timeout=0.01):
+                pass
+
     async def test_baseref(self):
 
         bref = await s_base.BaseRef.anit()

synapse/tests/test_lib_cell.py

@@ -635,7 +635,6 @@ class CellTest(s_t_utils.SynTest):
             async with self.getTestCell(s_cell.Cell, dirn=dir0, conf=conf) as cell00, \
                 cell00.getLocalProxy() as prox00:
 
-                self.true(cell00.nexsroot.map_async)
                 self.true(cell00.nexsroot.donexslog)
 
                 await prox00.addUser('test')
@@ -932,7 +931,7 @@ class CellTest(s_t_utils.SynTest):
                         pass
                 stream.seek(0)
                 buf = stream.read()
-                self.isin(f'...cell API (telepath): cell://root@{dirn}:*', buf)
+                self.isin(f'...cell API (telepath): tcp://0.0.0.0:27492', buf)
                 self.isin('...cell API (https): disabled', buf)
 
     async def test_cell_initargv_conf(self):
@@ -954,11 +953,11 @@ class CellTest(s_t_utils.SynTest):
                         # 1) cmdline
                         # 2) envars
                         # 3) cell.yaml
-                        self.true(cell.conf.reqConfValu('nexslog:en'))
-                        self.true(cell.conf.reqConfValu('nexslog:async'))
-                        self.none(cell.conf.reqConfValu('dmon:listen'))
-                        self.none(cell.conf.reqConfValu('https:port'))
-                        self.eq(cell.conf.reqConfValu('aha:name'), 'some:cell')
+                        self.true(cell.conf.req('nexslog:en'))
+                        self.true(cell.conf.req('nexslog:async'))
+                        self.none(cell.conf.req('dmon:listen'))
+                        self.none(cell.conf.req('https:port'))
+                        self.eq(cell.conf.req('aha:name'), 'some:cell')
                         root = cell.auth.rootuser
                         self.true(await root.tryPasswd('secret'))
 
@@ -966,7 +965,7 @@ class CellTest(s_t_utils.SynTest):
                 with self.getTestDir() as dirn:
                     s_common.yamlsave({'nexslog:en': False}, dirn, 'cell.mods.yaml')
                     async with await s_cell.Cell.initFromArgv([dirn]) as cell:
-                        self.false(cell.conf.reqConfValu('nexslog:en'))
+                        self.false(cell.conf.req('nexslog:en'))
                         # We can remove the valu from the overrides file with the pop API
                         # This is NOT reactive API which causes the whole behavior
                         # of the cell to suddenly change. This is intended to be used with
@@ -1038,6 +1037,7 @@ class CellTest(s_t_utils.SynTest):
                     errinfo = info.get('lastexception')
                     laststart1 = info['laststart']
                     self.eq(errinfo['err'], 'SynErr')
+                    self.eq(errinfo['errinfo']['mesg'], 'backup subprocess start timed out')
 
                     # Test runners can take an unusually long time to spawn a process
                     with mock.patch.object(s_cell.Cell, 'BACKUP_SPAWN_TIMEOUT', 8.0):
@@ -1050,15 +1050,17 @@ class CellTest(s_t_utils.SynTest):
                         self.ne(laststart1, laststart2)
                         errinfo = info.get('lastexception')
                         self.eq(errinfo['err'], 'SynErr')
+                        self.eq(errinfo['errinfo']['mesg'], 'backup subprocess start timed out')
 
-                        with mock.patch.object(s_cell.Cell, '_backupProc', staticmethod(_exiterProc)):
-                            await self.asyncraises(s_exc.SpawnExit, proxy.runBackup('_exiterProc'))
+                    with mock.patch.object(s_cell.Cell, '_backupProc', staticmethod(_exiterProc)):
+                        await self.asyncraises(s_exc.SpawnExit, proxy.runBackup('_exiterProc'))
 
-                        info = await proxy.getBackupInfo()
-                        laststart3 = info['laststart']
-                        self.ne(laststart2, laststart3)
-                        errinfo = info.get('lastexception')
-                        self.eq(errinfo['err'], 'SpawnExit')
+                    info = await proxy.getBackupInfo()
+                    laststart3 = info['laststart']
+                    self.ne(laststart2, laststart3)
+                    errinfo = info.get('lastexception')
+                    self.eq(errinfo['err'], 'SpawnExit')
+                    self.eq(errinfo['errinfo']['code'], 1)
 
                     # Create rando slabs inside cell dir
                     slabpath = s_common.genpath(coredirn, 'randoslab')
@@ -1741,7 +1743,7 @@ class CellTest(s_t_utils.SynTest):
                                                'has different iden') as stream:
                     async with self.getTestCell(s_cell.Cell, dirn=path01, conf=conf01) as cell01:
                         await stream.wait(timeout=2)
-                        self.true(await cell01.waitfini(6))
+                        self.true(await cell01.nexsroot.waitfini(6))
 
     async def test_backup_restore_base(self):
 
@@ -1836,15 +1838,42 @@ class CellTest(s_t_utils.SynTest):
                         self.true(s_common.isguid(second_doneiden))
                     self.ne(doneiden, second_doneiden)
 
+    async def test_cell_mirrorboot_failure(self):
+        async with self.getTestAha() as aha:  # type: s_aha.AhaCell
+
+            with self.getTestDir() as dirn:
+                cdr0 = s_common.genpath(dirn, 'cell00')
+                cdr1 = s_common.genpath(dirn, 'cell01')
+
+                async with self.addSvcToAha(aha, '00.cell', s_cell.Cell, dirn=cdr0) as cell00:
+
+                    conf = {'mirror': 'aha://cell...'}
+                    with self.raises(s_exc.FatalErr) as cm:
+                        async with self.getTestCell(conf=conf, dirn=cdr1) as cell01:
+                            self.fail('Cell01 should never boot')
+                    self.isin('No aha:provision configuration has been provided to allow the service to bootstrap',
+                              cm.exception.get('mesg'))
+
+                    provurl = await aha.addAhaSvcProv('01.cell', provinfo={'mirror': 'cell'})
+                    conf = self.getCellConf({'aha:provision': provurl})
+                    async with self.getTestCell(conf=conf, dirn=cdr1) as cell01:
+                        await cell01.sync()
+                    os.unlink(s_common.genpath(cdr1, 'cell.guid'))
+
+                    conf = self.getCellConf({'aha:provision': provurl})
+                    with self.raises(s_exc.FatalErr) as cm:
+                        async with self.getTestCell(conf=conf, dirn=cdr1) as cell01:
+                            self.fail('Cell01 should never boot')
+                    self.isin('The aha:provision URL guid matches the service prov.done guid',
+                              cm.exception.get('mesg'))
+
     async def test_backup_restore_aha(self):
         # do a mirror provisioning of a Cell
         # promote the mirror to being a leader
         # ensure the mirror has a
         # backup the mirror
         # restore the backup
-        async with self.getTestAhaProv(conf={'auth:passwd': 'secret'}) as aha:  # type: s_aha.AhaCell
-            root = await aha.auth.getUserByName('root')
-            self.true(await root.tryPasswd('secret'))
+        async with self.getTestAha() as aha:  # type: s_aha.AhaCell
 
             with self.getTestDir() as dirn:
                 cdr0 = s_common.genpath(dirn, 'core00')
@@ -1927,9 +1956,7 @@ class CellTest(s_t_utils.SynTest):
         # ensure the mirror has a
         # backup the mirror
         # restore the backup
-        async with self.getTestAhaProv(conf={'auth:passwd': 'secret'}) as aha:  # type: s_aha.AhaCell
-            root = await aha.auth.getUserByName('root')
-            self.true(await root.tryPasswd('secret'))
+        async with self.getTestAha() as aha:  # type: s_aha.AhaCell
 
             with self.getTestDir() as dirn:
                 cdr0 = s_common.genpath(dirn, 'core00')

synapse/tests/test_lib_config.py

@@ -31,7 +31,7 @@ class SchemaCell(s_cell.Cell):
         await s_cell.Cell.__anit__(self, dirn, conf, readonly, *args, **kwargs)
         # This captures a design pattern that reduces boilerplate
         # code used by Cell implementators.
-        self.conf.reqConfValu('apikey')
+        self.conf.req('apikey')
 
 
 class ConfTest(s_test.SynTest):
@@ -162,7 +162,7 @@ class ConfTest(s_test.SynTest):
         })
 
         # We can ensure that certain vars are loaded
-        self.eq('Funky string time!', conf.reqConfValu('key:string'))
+        self.eq('Funky string time!', conf.req('key:string'))
         # And throw if they are not, or if the requested key isn't even schema valid
         self.raises(s_exc.NeedConfValu, conf.reqConfValu, 'key:bool:nodefval')
         self.raises(s_exc.BadArg, conf.reqConfValu, 'key:newp')
@@ -286,7 +286,8 @@ class ConfTest(s_test.SynTest):
                 # Trying to make a cell with a missing key it wants fails
                 async with await SchemaCell.anit(dirn, conf={}) as cell:
                     pass
-            self.eq(cm.exception.get('key'), 'apikey')
+
+            self.eq(cm.exception.get('name'), 'apikey')
 
     def test_hideconf(self):
         hide_schema = {

synapse/tests/test_lib_nexus.py

@@ -111,6 +111,14 @@ class NexusTest(s_t_utils.SynTest):
                     stream.seek(0)
                     self.isin('while replaying log', stream.read())
 
+    async def test_nexus_modroot(self):
+
+        async with self.getTestCell() as cell:
+            await cell.sync()
+            async with cell.nexslock:
+                await cell.modNexsRoot(cell._ctorNexsRoot)
+            await cell.sync()
+
     async def test_nexus_mixin(self):
         with self.getTestDir() as dirn:
             dir1 = s_common.genpath(dirn, 'nexus1')

synapse/tests/test_lib_stormlib_aha.py

@@ -10,7 +10,7 @@ class AhaLibTest(s_test.SynTest):
 
     async def test_stormlib_aha_basics(self):
 
-        async with self.getTestAhaProv() as aha:
+        async with self.getTestAha() as aha:
 
             with self.getTestDir() as dirn:
 
@@ -36,24 +36,24 @@ class AhaLibTest(s_test.SynTest):
                 self.len(5, svcs)
 
                 svc = await core00.callStorm('return( $lib.aha.get(core...) )')
-                self.eq('core.loop.vertex.link', svc.get('name'))
-                svc = await core00.callStorm('return( $lib.aha.get(core.loop.vertex.link))')
-                self.eq('core.loop.vertex.link', svc.get('name'))
+                self.eq('core.synapse', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(core.synapse))')
+                self.eq('core.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(00.cell...))')
-                self.eq('00.cell.loop.vertex.link', svc.get('name'))
+                self.eq('00.cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(cell...))')
-                self.eq('cell.loop.vertex.link', svc.get('name'))
+                self.eq('cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('$f=({"mirror": (true)}) return( $lib.aha.get(cell..., filters=$f))')
-                self.eq('01.cell.loop.vertex.link', svc.get('name'))
+                self.eq('01.cell.synapse', svc.get('name'))
 
                 # List the aha services available
                 msgs = await core00.stormlist('aha.svc.list --nexus')
                 self.stormIsInPrint('Nexus', msgs)
-                self.stormIsInPrint('00.cell.loop.vertex.link                      true   true   true', msgs)
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  true   true', msgs)
-                self.stormIsInPrint('cell.loop.vertex.link                         true   true   true', msgs)
-                self.stormIsInPrint('core.loop.vertex.link                         null   true   true', msgs)
-                self.stormIsInPrint('mysvc.loop.vertex.link                        null   true   true', msgs)
+                self.stormIsInPrint('00.cell.synapse                      true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('01.cell.synapse                      false  true   true', msgs, whitespace=False)
+                self.stormIsInPrint('cell.synapse                         true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('core.synapse                         null   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('mysvc.synapse                        null   true   true', msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.list')
                 self.stormNotInPrint('Nexus', msgs)
@@ -63,24 +63,24 @@ class AhaLibTest(s_test.SynTest):
                 # Omit checking part of that.
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
 Cell iden:  ********************************
 Leader:     cell
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
-                self.stormIsInPrint('    hostname:   00.cell.loop.vertex.link', msgs)
+                self.stormIsInPrint('    hostname:   00.cell.synapse', msgs)
                 self.stormIsInPrint('    scheme:     ssl', msgs)
                 self.stormIsInPrint('    user:       root', msgs)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus cell...')
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -88,14 +88,14 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 01.cell...')
                 emsg = '''Resolved 01.cell... to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -103,15 +103,15 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 # Full name works
-                msgs = await core00.stormlist('aha.svc.stat 01.cell.loop.vertex.link')
-                emsg = '''Resolved 01.cell.loop.vertex.link to an AHA Service.
+                msgs = await core00.stormlist('aha.svc.stat 01.cell.synapse')
+                emsg = '''Resolved 01.cell.synapse to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
@@ -128,8 +128,8 @@ Name:       01.cell.loop.vertex.link
                 emsg = '''Resolved pool00... to an AHA Pool.
 
 The pool currently has 1 members.
-AHA Pool:   pool00.loop.vertex.link
-Member:     00.cell.loop.vertex.link'''
+AHA Pool:   pool00.synapse
+Member:     00.cell.synapse'''
                 self.stormIsInPrint(emsg, msgs)
 
                 # Shut down a service
@@ -139,15 +139,15 @@ Member:     00.cell.loop.vertex.link'''
                 self.len(nevents, await waiter.wait(timeout=12))
 
                 msgs = await core00.stormlist('aha.svc.list')
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  false', msgs)
+                self.stormIsInPrint('01.cell.synapse false  false  false', msgs, whitespace=False)
 
                 # Fake a record
                 await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp', 'host': '0.0.0.0', 'port': '3030'}},
-                                    network='loop.vertex.link')
+                                    network='synapse')
 
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   false  null  0.0.0.0         3030  <offline>'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse                      null   false  null  0.0.0.0         3030  <offline>'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 self.none(await core00.callStorm('return($lib.aha.del(00.newp...))'))
                 msgs = await core00.stormlist('aha.svc.list')
@@ -160,22 +160,22 @@ Member:     00.cell.loop.vertex.link'''
                                                                  'port': '3030'},
                                                      'online': guid,
                                                      },
-                                    network='loop.vertex.link')
+                                    network='synapse')
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   true   null  0.0.0.0         3030  ' \
-                       'Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error:'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse null   true   null  0.0.0.0         3030  ' \
+                       'Failed to connect to Telepath service: "aha://00.newp.synapse/" error:'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 00.newp...')
                 emsg = '''Resolved 00.newp... to an AHA Service.
 
-Name:       00.newp.loop.vertex.link
+Name:       00.newp.synapse
 Online:     true
 Ready:      null
 Run iden:   $lib.null
 Cell iden:  $lib.null
 Leader:     Service did not register itself with a leader name.
-Nexus:      Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
+Nexus:      Failed to connect to Telepath service: "aha://00.newp.synapse/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
 Connection information:
     host:       0.0.0.0
     port:       3030
@@ -184,7 +184,7 @@ Connection information:
                 self.stormIsInPrint(emsg, msgs)
 
                 # Delete the fake service with its full service name
-                self.none(await core00.callStorm('return($lib.aha.del(00.newp.loop.vertex.link))'))
+                self.none(await core00.callStorm('return($lib.aha.del(00.newp.synapse))'))
                 self.none(await core00.callStorm('return($lib.aha.get(00.newp...))'))
 
                 # Coverage for sad paths

synapse/tests/test_lib_stormlib_cell.py

@@ -76,18 +76,7 @@ class StormCellTest(s_test.SynTest):
 
     async def test_stormlib_cell_getmirrors(self):
 
-        conf = {
-            'aha:name': 'aha',
-            'aha:network': 'mynet',
-            'provision:listen': 'tcp://127.0.0.1:0',
-        }
-        async with self.getTestCell(s_aha.AhaCell, conf=conf) as aha:
-
-            provaddr, provport = aha.provdmon.addr
-            aha.conf['provision:listen'] = f'tcp://127.0.0.1:{provport}'
-
-            ahahost, ahaport = await aha.dmon.listen('ssl://127.0.0.1:0?hostname=aha.mynet&ca=mynet')
-            aha.conf['aha:urls'] = (f'ssl://127.0.0.1:{ahaport}?hostname=aha.mynet',)
+        async with self.getTestAha() as aha:
 
             provurl = await aha.addAhaSvcProv('00.cortex')
             coreconf = {'aha:provision': provurl}
@@ -116,7 +105,7 @@ class StormCellTest(s_test.SynTest):
                     await core01.nodes('[ inet:ipv4=1.2.3.4 ]')
                     self.len(1, await core00.nodes('inet:ipv4=1.2.3.4'))
 
-                    expurls = ['aha://01.cortex.mynet']
+                    expurls = ['aha://01.cortex.synapse']
 
                     self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls())'))
                     self.eq(expurls, await core01.callStorm('return($lib.cell.getMirrorUrls())'))
@@ -148,11 +137,11 @@ class StormCellTest(s_test.SynTest):
 
                         await svc01.sync()
 
-                        expurls = ('aha://01.testsvc.mynet',)
+                        expurls = ('aha://01.testsvc.synapse',)
 
                         self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))'))
 
-                    await aha.delAhaSvc('00.testsvc.mynet')
+                    await aha.delAhaSvc('00.testsvc.synapse')
 
                     with self.raises(s_exc.NoSuchName):
                         await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))')

synapse/tests/test_lib_stormlib_imap.py

@@ -1,3 +1,4 @@
+import ssl
 import asyncio
 
 from unittest import mock
@@ -124,8 +125,13 @@ class ImapTest(s_test.SynTest):
 
     async def test_storm_imap(self):
 
-        with mock.patch('aioimaplib.IMAP4.create_client', mock_create_client), \
-            mock.patch('aioimaplib.IMAP4_SSL.create_client', mock_create_client):
+        client_args = []
+        def client_mock(*args, **kwargs):
+            client_args.append((args, kwargs))
+            return mock_create_client(*args, **kwargs)
+
+        with mock.patch('aioimaplib.IMAP4.create_client', client_mock), \
+            mock.patch('aioimaplib.IMAP4_SSL.create_client', client_mock):
 
             async with self.getTestCore() as core:
 
@@ -137,16 +143,20 @@ class ImapTest(s_test.SynTest):
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, ('INBOX',)), retn)
+                ctx = self.nn(client_args[-1][0][5])  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_REQUIRED)
 
                 # search for UIDs
                 scmd = '''
-                    $server = $lib.inet.imap.connect(hello)
+                    $server = $lib.inet.imap.connect(hello, ssl_verify=(false))
                     $server.login("vtx@email.com", "secret")
                     $server.select("INBOX")
                     return($server.search("FROM", "foo@mail.com"))
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, ('8181', '8192', '8194')), retn)
+                ctx = self.nn(client_args[-1][0][5])  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_NONE)
 
                 # search for UIDs with specific charset
                 scmd = '''
@@ -186,6 +196,7 @@ class ImapTest(s_test.SynTest):
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, None), retn)
+                self.none(client_args[-1][0][5])
 
                 # delete
                 scmd = '''

synapse/tests/test_lib_stormlib_smtp.py

@@ -1,3 +1,6 @@
+import ssl
+import email.mime.multipart as e_muiltipart
+
 from unittest import mock
 import synapse.tests.utils as s_test
 
@@ -5,7 +8,9 @@ class SmtpTest(s_test.SynTest):
 
     async def test_storm_smtp(self):
 
+        called_args = []
         async def send(*args, **kwargs):
+            called_args.append((args, kwargs))
             return
 
         with mock.patch('aiosmtplib.send', send):
@@ -14,6 +19,9 @@ class SmtpTest(s_test.SynTest):
 
                 retn = await core.callStorm('return($lib.inet.smtp.message().send(127.0.0.1))')
                 self.false(retn[0])
+                self.eq(retn[1].get('err'), 'StormRuntimeError')
+                self.isin('The inet:smtp:message has no HTML or text body.', retn[1].get('errmsg'))
+                self.len(0, called_args)
 
                 retn = await core.callStorm('''
                     $message = $lib.inet.smtp.message()
@@ -31,6 +39,49 @@ class SmtpTest(s_test.SynTest):
                     return($message.send('smtp.gmail.com', port=465, usetls=true))
                 ''')
                 self.eq(retn, (True, {}))
+                mesg = called_args[-1][0][0]  # type: e_muiltipart.MIMEMultipart
+                self.eq(mesg.get_all('subject'), ['woot'])
+                payload = mesg.get_payload()
+                self.len(2, payload)
+                self.eq([pl.get_content_type() for pl in payload],
+                        ['text/plain', 'text/html'])
+                ctx = self.nn(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_REQUIRED)
+                self.eq(called_args[-1][1].get('port'), 465)
+                self.true(called_args[-1][1].get('use_tls'))
+                self.false(called_args[-1][1].get('start_tls'))
+
+                retn = await core.callStorm('''
+                    $message = $lib.inet.smtp.message()
+                    $message.text = "HELLO WORLD"
+                    $message.sender = visi@vertex.link
+                    $message.headers.Subject = woot
+                    $message.recipients.append(visi@vertex.link)
+                    return($message.send('smtp.gmail.com', port=465, starttls=true, ssl_verify=(false)))
+                ''')
+                self.eq(retn, (True, {}))
+                mesg = called_args[-1][0][0]  # type: e_muiltipart.MIMEMultipart
+                payload = mesg.get_payload()
+                self.len(1, payload)
+                self.eq([pl.get_content_type() for pl in payload], ['text/plain'])
+                ctx = self.nn(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_NONE)
+                self.false(called_args[-1][1].get('use_tls'))
+                self.true(called_args[-1][1].get('start_tls'))
+
+                retn = await core.callStorm('''
+                    $message = $lib.inet.smtp.message()
+                    $message.text = "HELLO WORLD"
+                    $message.sender = visi@vertex.link
+                    $message.headers.Subject = woot
+                    $message.recipients.append(visi@vertex.link)
+                    return($message.send('smtp.gmail.com', port=25))
+                ''')
+                self.eq(retn, (True, {}))
+                self.none(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(called_args[-1][1].get('port'), 25)
+                self.false(called_args[-1][1].get('use_tls'))
+                self.false(called_args[-1][1].get('start_tls'))
 
                 isok, info = await core.callStorm('''
                     $message = $lib.inet.smtp.message()