Skip to content

Commit 0f08e62

Browse files
authored
Pylint 29. (#791)
1 parent c895f2b commit 0f08e62

File tree

5 files changed

+236
-166
lines changed

5 files changed

+236
-166
lines changed

test/test_file_message.py

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,31 @@
33
Bit Message Test Fixture
44
--------------------------------
55
6-
This fixture tests the functionality of all the
6+
This fixture tests the functionality of all the
77
bit based request/response messages:
88
99
* Read/Write Discretes
1010
* Read Coils
1111
'''
1212
import unittest
13-
from pymodbus.file_message import *
14-
from pymodbus.exceptions import *
13+
from pymodbus.file_message import (
14+
WriteFileRecordResponse,
15+
FileRecord,
16+
WriteFileRecordRequest,
17+
ReadFileRecordRequest,
18+
ReadFileRecordResponse,
19+
ReadFifoQueueRequest,
20+
ReadFifoQueueResponse,
21+
)
1522
from pymodbus.pdu import ModbusExceptions
1623

1724
from .modbus_mocks import MockContext
1825

1926
#---------------------------------------------------------------------------#
2027
# Fixture
2128
#---------------------------------------------------------------------------#
22-
class ModbusBitMessageTests(unittest.TestCase):
23-
29+
class ModbusBitMessageTests(unittest.TestCase): # pylint: disable=too-many-public-methods
30+
""" Modbus bit message tests. """
2431
#-----------------------------------------------------------------------#
2532
# Setup/TearDown
2633
#-----------------------------------------------------------------------#
@@ -30,29 +37,27 @@ def setUp(self):
3037
Initializes the test environment and builds request/result
3138
encoding pairs
3239
'''
33-
pass
3440

3541
def tearDown(self):
3642
''' Cleans up the test environment '''
37-
pass
3843

3944
#-----------------------------------------------------------------------#
4045
# Read Fifo Queue
4146
#-----------------------------------------------------------------------#
4247

43-
def testReadFifoQueueRequestEncode(self):
48+
def test_read_fifo_queue_request_encode(self):
4449
''' Test basic bit message encoding/decoding '''
4550
handle = ReadFifoQueueRequest(0x1234)
4651
result = handle.encode()
4752
self.assertEqual(result, b'\x12\x34')
4853

49-
def testReadFifoQueueRequestDecode(self):
54+
def test_read_fifo_queue_request_decode(self):
5055
''' Test basic bit message encoding/decoding '''
5156
handle = ReadFifoQueueRequest(0x0000)
5257
handle.decode(b'\x12\x34')
5358
self.assertEqual(handle.address, 0x1234)
5459

55-
def testReadFifoQueueRequest(self):
60+
def test_read_fifo_queue_request(self):
5661
''' Test basic bit message encoding/decoding '''
5762
context = MockContext()
5863
handle = ReadFifoQueueRequest(0x1234)
@@ -69,29 +74,29 @@ def testReadFifoQueueRequest(self):
6974
self.assertEqual(ModbusExceptions.IllegalValue,
7075
result.exception_code)
7176

72-
def testReadFifoQueueRequestError(self):
77+
def test_read_fifo_queue_request_error(self):
7378
''' Test basic bit message encoding/decoding '''
7479
context = MockContext()
7580
handle = ReadFifoQueueRequest(0x1234)
7681
handle.values = [0x00]*32
7782
result = handle.execute(context)
7883
self.assertEqual(result.function_code, 0x98)
7984

80-
def testReadFifoQueueResponseEncode(self):
85+
def test_read_fifo_queue_response_encode(self):
8186
''' Test that the read fifo queue response can encode '''
8287
message = b'\x00\n\x00\x08\x00\x01\x00\x02\x00\x03\x00\x04'
8388
handle = ReadFifoQueueResponse([1,2,3,4])
8489
result = handle.encode()
8590
self.assertEqual(result, message)
8691

87-
def testReadFifoQueueResponseDecode(self):
92+
def test_read_fifo_queue_response_decode(self):
8893
''' Test that the read fifo queue response can decode '''
8994
message = b'\x00\n\x00\x08\x00\x01\x00\x02\x00\x03\x00\x04'
9095
handle = ReadFifoQueueResponse([1,2,3,4])
9196
handle.decode(message)
9297
self.assertEqual(handle.values, [1,2,3,4])
9398

94-
def testRtuFrameSize(self):
99+
def test_rtu_frame_size(self):
95100
''' Test that the read fifo queue response can decode '''
96101
message = b'\x00\n\x00\x08\x00\x01\x00\x02\x00\x03\x00\x04'
97102
result = ReadFifoQueueResponse.calculateRtuFrameSize(message)
@@ -101,14 +106,14 @@ def testRtuFrameSize(self):
101106
# File Record
102107
#-----------------------------------------------------------------------#
103108

104-
def testFileRecordLength(self):
109+
def test_file_record_length(self):
105110
''' Test file record length generation '''
106111
record = FileRecord(file_number=0x01, record_number=0x02,
107112
record_data=b'\x00\x01\x02\x04')
108113
self.assertEqual(record.record_length, 0x02)
109114
self.assertEqual(record.response_length, 0x05)
110115

111-
def testFileRecordComapre(self):
116+
def test_file_record_compare(self):
112117
''' Test file record comparison operations '''
113118
record1 = FileRecord(file_number=0x01, record_number=0x02, record_data=b'\x00\x01\x02\x04')
114119
record2 = FileRecord(file_number=0x01, record_number=0x02, record_data=b'\x00\x0a\x0e\x04')
@@ -128,29 +133,29 @@ def testFileRecordComapre(self):
128133
# Read File Record Request
129134
#-----------------------------------------------------------------------#
130135

131-
def testReadFileRecordRequestEncode(self):
136+
def test_read_file_record_request_encode(self):
132137
''' Test basic bit message encoding/decoding '''
133138
records = [FileRecord(file_number=0x01, record_number=0x02)]
134139
handle = ReadFileRecordRequest(records)
135140
result = handle.encode()
136141
self.assertEqual(result, b'\x07\x06\x00\x01\x00\x02\x00\x00')
137142

138-
def testReadFileRecordRequestDecode(self):
143+
def test_read_file_record_request_decode(self):
139144
''' Test basic bit message encoding/decoding '''
140145
record = FileRecord(file_number=0x04, record_number=0x01, record_length=0x02)
141146
request = b'\x0e\x06\x00\x04\x00\x01\x00\x02\x06\x00\x03\x00\x09\x00\x02'
142147
handle = ReadFileRecordRequest()
143148
handle.decode(request)
144149
self.assertEqual(handle.records[0], record)
145150

146-
def testReadFileRecordRequestRtuFrameSize(self):
151+
def test_read_file_record_request_rtu_frame_size(self):
147152
''' Test basic bit message encoding/decoding '''
148153
request = b'\x00\x00\x0e\x06\x00\x04\x00\x01\x00\x02\x06\x00\x03\x00\x09\x00\x02'
149154
handle = ReadFileRecordRequest()
150155
size = handle.calculateRtuFrameSize(request)
151156
self.assertEqual(size, 0x0e + 5)
152157

153-
def testReadFileRecordRequestExecute(self):
158+
def test_read_file_record_request_execute(self):
154159
''' Test basic bit message encoding/decoding '''
155160
handle = ReadFileRecordRequest()
156161
result = handle.execute(None)
@@ -160,14 +165,14 @@ def testReadFileRecordRequestExecute(self):
160165
# Read File Record Response
161166
#-----------------------------------------------------------------------#
162167

163-
def testReadFileRecordResponseEncode(self):
168+
def test_read_file_record_response_encode(self):
164169
''' Test basic bit message encoding/decoding '''
165170
records = [FileRecord(record_data=b'\x00\x01\x02\x03')]
166171
handle = ReadFileRecordResponse(records)
167172
result = handle.encode()
168173
self.assertEqual(result, b'\x06\x06\x02\x00\x01\x02\x03')
169174

170-
def testReadFileRecordResponseDecode(self):
175+
def test_read_file_record_response_decode(self):
171176
''' Test basic bit message encoding/decoding '''
172177
record = FileRecord(file_number=0x00, record_number=0x00,
173178
record_data=b'\x0d\xfe\x00\x20')
@@ -176,7 +181,7 @@ def testReadFileRecordResponseDecode(self):
176181
handle.decode(request)
177182
self.assertEqual(handle.records[0], record)
178183

179-
def testReadFileRecordResponseRtuFrameSize(self):
184+
def test_read_file_record_response_rtu_frame_size(self):
180185
''' Test basic bit message encoding/decoding '''
181186
request = b'\x00\x00\x0c\x05\x06\x0d\xfe\x00\x20\x05\x05\x06\x33\xcd\x00\x40'
182187
handle = ReadFileRecordResponse()
@@ -187,14 +192,15 @@ def testReadFileRecordResponseRtuFrameSize(self):
187192
# Write File Record Request
188193
#-----------------------------------------------------------------------#
189194

190-
def testWriteFileRecordRequestEncode(self):
195+
def test_write_file_record_request_encode(self):
191196
''' Test basic bit message encoding/decoding '''
192-
records = [FileRecord(file_number=0x01, record_number=0x02, record_data=b'\x00\x01\x02\x03')]
197+
records = [FileRecord(file_number=0x01, record_number=0x02,
198+
record_data=b'\x00\x01\x02\x03')]
193199
handle = WriteFileRecordRequest(records)
194200
result = handle.encode()
195201
self.assertEqual(result, b'\x0b\x06\x00\x01\x00\x02\x00\x02\x00\x01\x02\x03')
196202

197-
def testWriteFileRecordRequestDecode(self):
203+
def test_write_file_record_request_decode(self):
198204
''' Test basic bit message encoding/decoding '''
199205
record = FileRecord(file_number=0x04, record_number=0x07,
200206
record_data=b'\x06\xaf\x04\xbe\x10\x0d')
@@ -203,14 +209,14 @@ def testWriteFileRecordRequestDecode(self):
203209
handle.decode(request)
204210
self.assertEqual(handle.records[0], record)
205211

206-
def testWriteFileRecordRequestRtuFrameSize(self):
212+
def test_write_file_record_request_rtu_frame_size(self):
207213
''' Test write file record request rtu frame size calculation '''
208214
request = b'\x00\x00\x0d\x06\x00\x04\x00\x07\x00\x03\x06\xaf\x04\xbe\x10\x0d'
209215
handle = WriteFileRecordRequest()
210216
size = handle.calculateRtuFrameSize(request)
211217
self.assertEqual(size, 0x0d + 5)
212218

213-
def testWriteFileRecordRequestExecute(self):
219+
def test_write_file_record_request_execute(self):
214220
''' Test basic bit message encoding/decoding '''
215221
handle = WriteFileRecordRequest()
216222
result = handle.execute(None)
@@ -220,14 +226,15 @@ def testWriteFileRecordRequestExecute(self):
220226
# Write File Record Response
221227
#-----------------------------------------------------------------------#
222228

223-
def testWriteFileRecordResponseEncode(self):
229+
def test_write_file_record_response_encode(self):
224230
''' Test basic bit message encoding/decoding '''
225-
records = [FileRecord(file_number=0x01, record_number=0x02, record_data=b'\x00\x01\x02\x03')]
231+
records = [FileRecord(file_number=0x01, record_number=0x02,
232+
record_data=b'\x00\x01\x02\x03')]
226233
handle = WriteFileRecordResponse(records)
227234
result = handle.encode()
228235
self.assertEqual(result, b'\x0b\x06\x00\x01\x00\x02\x00\x02\x00\x01\x02\x03')
229236

230-
def testWriteFileRecordResponseDecode(self):
237+
def test_write_file_record_response_decode(self):
231238
''' Test basic bit message encoding/decoding '''
232239
record = FileRecord(file_number=0x04, record_number=0x07,
233240
record_data=b'\x06\xaf\x04\xbe\x10\x0d')
@@ -236,7 +243,7 @@ def testWriteFileRecordResponseDecode(self):
236243
handle.decode(request)
237244
self.assertEqual(handle.records[0], record)
238245

239-
def testWriteFileRecordResponseRtuFrameSize(self):
246+
def test_write_file_record_response_rtu_frame_size(self):
240247
''' Test write file record response rtu frame size calculation '''
241248
request = b'\x00\x00\x0d\x06\x00\x04\x00\x07\x00\x03\x06\xaf\x04\xbe\x10\x0d'
242249
handle = WriteFileRecordResponse()

0 commit comments

Comments
 (0)