coverage

Author: Cisphyx

synapse/models/inet.py

@@ -461,9 +461,9 @@ def _normPyStr(self, valu):
                     portstr = f':{port}'
 
                 elif self.defport:
-                    subs['port'] = self.port
-                    virts['port'] = (self.port, self.porttype.stortype)
-                    portstr = f':{self.port}'
+                    subs['port'] = self.defport
+                    virts['port'] = (self.defport, self.porttype.stortype)
+                    portstr = f':{self.defport}'
 
                 return f'{proto}://[{host}]{portstr}', {'subs': subs, 'virts': virts}
 
@@ -475,6 +475,12 @@ def _normPyStr(self, valu):
             host = self.iptype.repr(ipv6)
             subs['ip'] = ipv6
             virts['ip'] = (ipv6, self.iptype.stortype)
+
+            if self.defport:
+                subs['port'] = self.defport
+                virts['port'] = (self.defport, self.porttype.stortype)
+                return f'{proto}://[{host}]:{self.defport}', {'subs': subs, 'virts': virts}
+
             return f'{proto}://{host}', {'subs': subs, 'virts': virts}
 
         # Otherwise treat as IPv4

synapse/tests/test_model_inet.py

@@ -1358,6 +1358,12 @@ async def test_server(self):
             nodes = await core.nodes('[ it:network=* :dns:resolvers=(([6, 1]),)]')
             self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))
 
+            nodes = await core.nodes('[ it:network=* :dns:resolvers=("::1",)]')
+            self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))
+
+            nodes = await core.nodes('[ it:network=* :dns:resolvers=("[::1]",)]')
+            self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))
+
     async def test_servfile(self):
         async with self.getTestCore() as core:
             valu = ('tcp://127.0.0.1:4040', 64 * 'f')