synapse 2.200.0__py311-none-any.whl → 2.202.0__py311-none-any.whl

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/telepath.py

@@ -31,6 +31,8 @@ televers = (3, 0)
 
 aha_clients = {}
 
+LINK_CULL_INTERVAL = 10
+
 async def addAhaUrl(url):
     '''
     Add (incref) an aha registry URL.
@@ -590,6 +592,10 @@ class Proxy(s_base.Base):
         valu = proxy.getFooValu(x, y)
 
     '''
+    _link_task = None
+    _link_event = asyncio.Event()
+    _all_proxies = set()
+
     async def __anit__(self, link, name):
 
         await s_base.Base.__anit__(self)
@@ -608,11 +614,15 @@ class Proxy(s_base.Base):
         self.methinfo = {}
 
         self.sess = None
+
         self.links = collections.deque()
-        self._link_poolsize = 4
+        self.alllinks = collections.deque()
+
+        self._link_add = 0      # counter for pending links being connected
+        self._links_min = 4     # low water mark for the link pool
+        self._links_max = 12    # high water mark for the link pool
 
         self.synack = None
-        self.syndone = asyncio.Event()
 
         self.handlers = {
             'task:fini': self._onTaskFini,
@@ -626,19 +636,52 @@ class Proxy(s_base.Base):
                 await item.fini()
 
             mesg = ('task:fini', {'retn': (False, ('IsFini', {}))})
-            for name, task in list(self.tasks.items()):
+            for iden, task in list(self.tasks.items()):  # pragma: no cover
                 task.reply(mesg)
-                del self.tasks[name]
+                del self.tasks[iden]
 
-            for link in self.links:
-                await link.fini()
+            # fini all the links from a different task to prevent
+            # delaying the proxy shutdown...
+            s_coro.create_task(self._finiAllLinks())
 
-            del self.syndone
-            await self.link.fini()
+            if self in self._all_proxies:
+                self._all_proxies.remove(self)
+
+            if not Proxy._all_proxies and Proxy._link_task is not None:
+                Proxy._link_task.cancel()
+                Proxy._link_task = None
+
+        Proxy._all_proxies.add(self)
 
         self.onfini(fini)
         self.link.onfini(self.fini)
 
+        if Proxy._link_task is None:
+            Proxy._link_task = s_coro.create_task(Proxy._linkLoopTask())
+
+    @classmethod
+    async def _linkLoopTask(clas):
+        while True:
+            try:
+                await s_coro.event_wait(Proxy._link_event, timeout=LINK_CULL_INTERVAL)
+
+                for proxy in list(Proxy._all_proxies):
+
+                    if proxy.isfini:
+                        continue
+
+                    # close one link per proxy per period if the number of
+                    # available links is greater than _links_max...
+                    if len(proxy.links) > proxy._links_max:
+                        link = proxy.links.popleft()
+                        await link.fini()
+                        await proxy.fire('pool:link:fini', link=link)
+
+                Proxy._link_event.clear()
+
+            except Exception:  # pragma: no cover
+                logger.exception('synapse.telepath.Proxy.linkLoopTask()')
+
     def _hasTeleFeat(self, name, vers=1):
         return self._features.get(name, 0) >= vers
 
@@ -692,6 +735,12 @@ class Proxy(s_base.Base):
 
             link = self.links.popleft()
 
+            # fire a task to replace the link if we are
+            # below the low-water mark for link count.
+            if len(self.links) + self._link_add < self._links_min:
+                self._link_add += 1
+                self.schedCoro(self._addPoolLink())
+
             if link.isfini:
                 continue
 
@@ -700,6 +749,11 @@ class Proxy(s_base.Base):
         # we need a new one...
         return await self._initPoolLink()
 
+    async def _addPoolLink(self):
+        link = await self._initPoolLink()
+        self.links.append(link)
+        self._link_add -= 1
+
     async def getPipeline(self, genr, name=None):
         '''
         Construct a proxy API call pipeline in order to make
@@ -724,8 +778,6 @@ class Proxy(s_base.Base):
 
     async def _initPoolLink(self):
 
-        # TODO loop / backoff
-
         if self.link.get('unix'):
 
             path = self.link.get('path')
@@ -739,19 +791,26 @@ class Proxy(s_base.Base):
 
             link = await s_link.connect(host, port, ssl=ssl)
 
-        self.onfini(link)
+        self.alllinks.append(link)
+        async def fini():
+            self.alllinks.remove(link)
+            if link in self.links:
+                self.links.remove(link)
+
+        link.onfini(fini)
 
         return link
 
+    async def _finiAllLinks(self):
+        for link in list(self.alllinks):
+            await link.fini()
+        await self.link.fini()
+
     async def _putPoolLink(self, link):
 
         if link.isfini:
             return
 
-        # If we've exceeded our poolsize, discard the current link.
-        if len(self.links) >= self._link_poolsize:
-            return await link.fini()
-
         self.links.append(link)
 
     def __enter__(self):
@@ -862,6 +921,7 @@ class Proxy(s_base.Base):
 
                 except GeneratorExit:
                     # if they bail early on the genr, fini the link
+                    # TODO: devise a tx/rx strategy to recover these links...
                     await link.fini()
 
             return s_coro.GenrHelp(genrloop())
@@ -1321,7 +1381,6 @@ class Client(s_base.Base):
         info.update(self._t_opts)
         self._t_proxy = await openinfo(info)
         self._t_methinfo = self._t_proxy.methinfo
-        self._t_proxy._link_poolsize = self._t_conf.get('link_poolsize', 4)
 
         async def fini():
             if self._t_named_meths:

synapse/tests/test_cortex.py

@@ -7397,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)
@@ -8501,6 +8504,26 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.notin('Timeout waiting for pool mirror', data)
                     self.notin('Timeout waiting for query mirror', data)
 
+                    orig = s_telepath.ClientV2.proxy
+                    async def finidproxy(self, timeout=None):
+                        prox = await orig(self, timeout=timeout)
+                        await prox.fini()
+                        return prox
+
+                    with patch('synapse.telepath.ClientV2.proxy', finidproxy):
+                        with self.getLoggerStream('synapse') as stream:
+                            msgs = await alist(core00.storm('inet:asn=0'))
+                            self.len(1, [m for m in msgs if m[0] == 'node'])
+
+                    stream.seek(0)
+                    data = stream.read()
+                    self.isin('Proxy for pool mirror [01.core.synapse] was shutdown. Skipping.', data)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.set --connection-timeout 1 --sync-timeout 1 aha://pool00...')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Storm pool configuration set.', msgs)
+                    await core00.stormpool.waitready(timeout=12)
+
                     core01.nexsroot.nexslog.indx = 0
 
                     with patch('synapse.cortex.MAX_NEXUS_DELTA', 1):
@@ -8513,8 +8536,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                         stream.seek(0)
                         data = stream.read()
-                        explog = (f'Pool mirror [01.core.synapse] Nexus offset delta too large '
-                                  f'({nexsoffs} > 1), running query locally')
+                        explog = ('Pool mirror [01.core.synapse] is too far out of sync. Skipping.')
                         self.isin(explog, data)
                         self.notin('Offloading Storm query', data)
 
@@ -8572,7 +8594,8 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     stream.seek(0)
                     data = stream.read()
-                    self.isin('Timeout waiting for pool mirror, running query locally', data)
+                    self.isin('Timeout waiting for pool mirror proxy.', data)
+                    self.isin('Pool members exhausted. Running query locally.', data)
 
                     await core01.fini()
 

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

@@ -1817,8 +1817,16 @@ class CellTest(s_t_utils.SynTest):
 
                     with open(bkuppath3, 'wb') as bkup3:
                         async for msg in proxy.iterNewBackupArchive('bkup3', remove=True):
+                            self.true(core.backupstreaming)
                             bkup3.write(msg)
 
+                    async def streamdone():
+                        while core.backupstreaming:
+                            await asyncio.sleep(0)
+
+                    task = core.schedCoro(streamdone())
+                    await asyncio.wait_for(task, 15)
+
                     self.eq(('bkup', 'bkup2'), sorted(await proxy.getBackups()))
                     self.false(os.path.isdir(os.path.join(backdirn, 'bkup3')))
 
@@ -1830,6 +1838,9 @@ class CellTest(s_t_utils.SynTest):
                         async for msg in proxy.iterNewBackupArchive(remove=True):
                             bkup4.write(msg)
 
+                    task = core.schedCoro(streamdone())
+                    await asyncio.wait_for(task, 15)
+
                     self.eq(('bkup', 'bkup2'), sorted(await proxy.getBackups()))
 
                     # Start another backup while one is already running

synapse/tests/test_lib_grammar.py

@@ -746,6 +746,8 @@ Queries = [
     '[test:str=foo :bar--=(foo, bar)]',
     '[test:str=foo :bar?++=$baz]',
     '[test:str=foo :bar?--={[it:dev:str=foo]}]',
+    '$foo=(notime,)',
+    '$foo=(nulltime,)',
 ]
 
 # Generated with print_parse_list below
@@ -1394,6 +1396,8 @@ _ParseResults = [
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditPropSetMulti: [RelProp: [Const: bar], Const: --=, List: [Const: foo, Const: bar]]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditPropSetMulti: [RelProp: [Const: bar], Const: ?++=, VarValue: [Const: baz]]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditPropSetMulti: [RelProp: [Const: bar], Const: ?--=, SubQuery: [Query: [EditNodeAdd: [FormName: [Const: it:dev:str], Const: =, Const: foo]]]]]',
+    'Query: [SetVarOper: [Const: foo, List: [Const: notime]]]',
+    'Query: [SetVarOper: [Const: foo, List: [Const: nulltime]]]',
 ]
 
 class GrammarTest(s_t_utils.SynTest):

synapse/tests/test_lib_storm.py

@@ -167,6 +167,12 @@ class StormTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('ou:org=({"name": "origname"}) [ :name=newname ]'))
             self.len(0, await core.nodes('ou:org=({"name": "origname"})'))
 
+            nodes = await core.nodes('[ it:exec:proc=(notime,) ]')
+            self.len(1, nodes)
+
+            nodes = await core.nodes('[ it:exec:proc=(nulltime,) ]')
+            self.len(1, nodes)
+
     async def test_lib_storm_jsonexpr(self):
         async with self.getTestCore() as core:
 
@@ -5038,7 +5044,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_telepath.py

@@ -318,6 +318,10 @@ class TeleTest(s_t_utils.SynTest):
             link.onfini(evt.set)
             s_glob.sync(proxy._putPoolLink(link))
 
+            # Grab the fresh link from the pool so our original link is up next again
+            link2 = s_glob.sync(proxy.getPoolLink())
+            s_glob.sync(proxy._putPoolLink(link2))
+
             q = f'{form} | sleep 0.1'
 
             # Break from the generator right away, causing a
@@ -935,7 +939,6 @@ class TeleTest(s_t_utils.SynTest):
 
             # Validate the Proxy behavior then the client override
             prox = await s_telepath.openurl(url)  # type: Foo
-            prox._link_poolsize = 2
 
             # Start with no links
             self.len(0, prox.links)
@@ -947,53 +950,72 @@ class TeleTest(s_t_utils.SynTest):
             genr = await prox.genr()  # type: s_coro.GenrHelp
             self.eq(await genr.genr.__anext__(), 10)
 
-            # The link is being used by the genr
-            self.len(0, prox.links)
-
-            # and upon exhuastion, that link is put back
-            self.eq(await genr.list(), (20, 30))
+            # A new link is in the pool
             self.len(1, prox.links)
-            self.true(prox.links[0] is l0)
 
-            # Grab the existing link, then do two more calls
-            genr0 = await prox.genr()  # contains l0
-            genr1 = await prox.genr()
-            genr2 = await prox.genr()
-            self.len(0, prox.links)
-            # Consume two of the three generators
-            self.eq(await genr2.list(), (10, 20, 30))
-            self.len(1, prox.links)
-            self.eq(await genr1.list(), (10, 20, 30))
+            # and upon exhuastion, the first link is put back
+            self.eq(await genr.list(), (20, 30))
             self.len(2, prox.links)
-            # Exhausting the lsat generator results in his
-            # link not being placed back into the pool
-            self.eq(await genr0.list(), (10, 20, 30))
+            self.true(prox.links[1] is l0)
+
+            # Grabbing a link will still spin up another since we are below low watermark
+            genr = await prox.genr()  # type: s_coro.GenrHelp
+            self.eq(await genr.genr.__anext__(), 10)
+
             self.len(2, prox.links)
-            links = set(lnk for lnk in prox.links)
-            self.notin(l0, links)
-            # And that link l0 has been fini'd
-            self.true(l0.isfini)
+
+            self.eq(await genr.list(), (20, 30))
+            self.len(3, prox.links)
+
+            # Fill up pool above low watermark
+            genrs = [await prox.genr() for _ in range(2)]
+            [await genr.list() for genr in genrs]
+            self.len(5, prox.links)
+
+            # Grabbing a link no longer spins up a replacement
+            genr = await prox.genr()  # type: s_coro.GenrHelp
+            self.eq(await genr.genr.__anext__(), 10)
+            self.len(4, prox.links)
+
+            self.eq(await genr.list(), (20, 30))
+            self.len(5, prox.links)
 
             # Tear down a link by hand and place it back
             # into the pool - that will fail b/c the link
             # has been down down.
             l1 = await prox.getPoolLink()
-            self.len(1, prox.links)
+            self.len(4, prox.links)
             await l1.fini()
             await prox._putPoolLink(l1)
-            self.len(1, prox.links)
+            self.len(4, prox.links)
 
             # And all our links are torn down on fini
             await prox.fini()
-            self.len(1, prox.links)
-            for link in prox.links:
-                self.true(link.isfini)
+            self.len(4, prox.links)
+            for link in list(prox.links):
+                self.true(await link.waitfini(1))
+            self.len(0, prox.links)
+
+        with mock.patch('synapse.telepath.LINK_CULL_INTERVAL', 1):
+            async with self.getTestDmon() as dmon:
+                dmon.share('foo', foo)
+                url = f'tcp://127.0.0.1:{dmon.addr[1]}/foo'
+
+                prox = await s_telepath.openurl(url)
 
-            # The telepath Client passes through this value as a configuration parameter
-            conf = {'link_poolsize': 2, 'timeout': 2}
-            async with await s_telepath.Client.anit(url, conf=conf) as client:
-                await client.waitready()
-                self.true(client._t_proxy._link_poolsize, 2)
+                # Fill up pool above high watermark
+                genrs = [await prox.genr() for _ in range(13)]
+                [await genr.list() for genr in genrs]
+                self.len(13, prox.links)
+
+                # Add a fini'd proxy for coverage
+                prox2 = await s_telepath.openurl(url)
+                await prox2.fini()
+                prox2._all_proxies.add(prox2)
+
+                wait = prox.waiter(1, 'pool:link:fini')
+                self.len(1, await wait.wait(timeout=5))
+                self.len(12, prox.links)
 
     async def test_link_fini_breaking_tasks(self):
         foo = Foo()
@@ -1062,7 +1084,7 @@ class TeleTest(s_t_utils.SynTest):
 
                 self.eq(vals, (40, 50, 60))
 
-                self.eq(1, len(proxy.links))
+                self.eq(2, len(proxy.links))
                 self.eq(160, await proxy.bar(80, 80))
 
                 async def boomgenr():

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()