fix merge

app/tests/test_modbus_tcp.py

@@ -134,16 +134,6 @@ class FakeReader():
             raise TimeoutError
     def feed_eof(self):
         return
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-    async def read(self, max_len: int):
-        await self.on_recv.wait()
-        if test == TestType.RD_TEST_0_BYTES:
-            return b''
-        elif test == TestType.RD_TEST_TIMEOUT:
-            raise TimeoutError
-    def feed_eof(self):
-        return
 
 
 class FakeWriter():
@@ -161,20 +151,6 @@ class FakeWriter():
         return
     async def wait_closed(self):
         return
-    def write(self, buf: bytes):
-        return
-    def get_extra_info(self, sel: str):
-        if sel == 'peername':
-            return 'remote.intern'
-        elif sel == 'sockname':
-            return 'sock:1234'
-        assert False
-    def is_closing(self):
-        return False
-    def close(self):
-        return
-    async def wait_closed(self):
-        return
 
 
 @pytest.fixture