Add a helper function for the last change, to make coverage easier

tests/test_agent.py

@@ -36,7 +36,7 @@
 from asyncssh.packet import Byte, String, UInt32
 
 from .sk_stub import sk_available, patch_sk
-from .util import AsyncTestCase, asynctest, get_test_key, run
+from .util import AsyncTestCase, asynctest, get_test_key, run, try_remove
 
 
 def agent_test(func):
@@ -85,10 +85,7 @@ async def stop(self):
         self._server.close()
         await self._server.wait_closed()
 
-        try:
-            os.remove(self._path)
-        except OSError:
-            pass
+        try_remove(self._path)
 
 
 class _TestAgent(AsyncTestCase):

tests/test_forward.py

@@ -37,7 +37,7 @@
 from asyncssh.socks import SOCKS4_OK_RESPONSE, SOCKS5_OK_RESPONSE_HDR
 
 from .server import Server, ServerTestCase
-from .util import asynctest, echo, make_certificate
+from .util import asynctest, echo, make_certificate, try_remove
 
 
 def _echo_non_async(stdin, stdout, stderr=None):
@@ -651,10 +651,7 @@ async def test_forward_local_path_to_port(self):
             async with conn.forward_local_path_to_port('local', '', 7):
                 await self._check_local_unix_connection('local')
 
-        try:
-            os.remove('local')
-        except OSError:
-            pass
+        try_remove('local')
 
     @unittest.skipIf(sys.platform == 'win32',
                      'skip UNIX domain socket tests on Windows')
@@ -668,10 +665,7 @@ async def test_forward_local_path_to_port_failure(self):
             with self.assertRaises(OSError):
                 await conn.forward_local_path_to_port('local', '', 7)
 
-        try:
-            os.remove('local')
-        except OSError:
-            pass
+        try_remove('local')
 
     @asynctest
     async def test_forward_local_port_pause(self):
@@ -805,10 +799,7 @@ async def test_forward_remote_port_to_path(self):
         server.close()
         await server.wait_closed()
 
-        try:
-            os.remove('local')
-        except OSError:
-            pass
+        try_remove('local')
 
     @asynctest
     async def test_forward_remote_specific_port(self):
@@ -1030,10 +1021,7 @@ async def test_unix_server(self):
             await listener.wait_closed()
             listener.close()
 
-        try:
-            os.remove('echo')
-        except OSError:
-            pass
+        try_remove('echo')
 
     @asynctest
     async def test_unix_server_open(self):
@@ -1066,10 +1054,7 @@ async def test_unix_server_non_async(self):
             async with conn.start_unix_server(_unix_listener_non_async, path):
                 await self._check_local_unix_connection('echo')
 
-        try:
-            os.remove('echo')
-        except OSError:
-            pass
+        try_remove('echo')
 
     @asynctest
     async def test_unix_server_failure(self):
@@ -1087,10 +1072,7 @@ async def test_forward_local_path(self):
             async with conn.forward_local_path('local', '/echo'):
                 await self._check_local_unix_connection('local')
 
-        try:
-            os.remove('local')
-        except OSError:
-            pass
+        try_remove('local')
 
     @asynctest
     async def test_forward_local_port_to_path_accept_handler(self):
@@ -1168,11 +1150,8 @@ async def test_forward_remote_path(self):
         server.close()
         await server.wait_closed()
 
-        try:
-            os.remove('echo')
-            os.remove('local')
-        except OSError:
-            pass
+        try_remove('echo')
+        try_remove('local')
 
     @asynctest
     async def test_forward_remote_path_to_port(self):
@@ -1192,10 +1171,7 @@ async def test_forward_remote_path_to_port(self):
         server.close()
         await server.wait_closed()
 
-        try:
-            os.remove('echo')
-        except OSError:
-            pass
+        try_remove('echo')
 
     @asynctest
     async def test_forward_remote_path_failure(self):
@@ -1209,10 +1185,7 @@ async def test_forward_remote_path_failure(self):
             with self.assertRaises(asyncssh.ChannelListenError):
                 await conn.forward_remote_path(path, 'local')
 
-        try:
-            os.remove('echo')
-        except OSError:
-            pass
+        try_remove('echo')
 
     @asynctest
     async def test_forward_remote_path_not_permitted(self):

tests/util.py

@@ -235,6 +235,15 @@ def run(cmd):
         raise
 
 
+def try_remove(filename):
+    """Try to remove a file, ignoring errors"""
+
+    try:
+        os.remove(filename)
+    except OSError: # pragma: no cover
+        pass
+
+
 class ConnectionStub:
     """Stub class used to replace an SSHConnection object"""