Skip to content

Commit 27373b5

Browse files
authored
Lint tests (#289)
* lint tests/discovery * lint tests/proxy * lint tests/serialization * lint tests/soak_test * lint tests/ssl_tests * lint tests/hzrc * lint tests * fix broken test
1 parent e1422d8 commit 27373b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1789
-937
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ exclude = '''
1515
1616
| benchmarks
1717
| hazelcast/protocol/codec
18-
| tests
1918
)/
2019
'''

tests/__init__.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
import subprocess
33

44
try:
5-
output = subprocess.check_output(["git", "show", "-s", "--format=\"%h\""]).decode()
6-
commit_id = output.strip().replace("\"", "").replace("'", "")
5+
output = subprocess.check_output(["git", "show", "-s", '--format="%h"']).decode()
6+
commit_id = output.strip().replace('"', "").replace("'", "")
77
except:
88
commit_id = ""
99

1010
logging.basicConfig(
11-
format='%(asctime)s%(msecs)03d [' + commit_id + '][%(threadName)s][%(name)s] %(levelname)s: %(message)s',
12-
datefmt="%H:%M:%S,")
11+
format="%(asctime)s%(msecs)03d ["
12+
+ commit_id
13+
+ "][%(threadName)s][%(name)s] %(levelname)s: %(message)s",
14+
datefmt="%H:%M:%S,",
15+
)
1316
logging.getLogger().setLevel(logging.INFO)

tests/address_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def test_v4_address_without_port(self):
1818
self._validate_without_port(self.v4_address, self.v4_address)
1919

2020
def test_v6_address_with_port(self):
21-
self._validate_with_port("[" + self.v6_address + "]:" + str(self.port), self.v6_address, self.port)
21+
self._validate_with_port(
22+
"[" + self.v6_address + "]:" + str(self.port), self.v6_address, self.port
23+
)
2224

2325
def test_v6_address_without_port(self):
2426
self._validate_without_port(self.v6_address, self.v6_address)

tests/base.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def __init__(self, methodName):
3939

4040
@staticmethod
4141
def create_rc():
42-
return HzRemoteController('127.0.0.1', 9701)
42+
return HzRemoteController("127.0.0.1", 9701)
4343

4444
@classmethod
4545
def create_cluster(cls, rc, config=None):
@@ -79,8 +79,16 @@ def assertSetEventually(self, event, timeout=5):
7979
is_set = event.wait(timeout)
8080
self.assertTrue(is_set, "Event was not set within %d seconds" % timeout)
8181

82-
def assertEntryEvent(self, event, event_type, key=None, value=None, old_value=None, merging_value=None,
83-
number_of_affected_entries=1):
82+
def assertEntryEvent(
83+
self,
84+
event,
85+
event_type,
86+
key=None,
87+
value=None,
88+
old_value=None,
89+
merging_value=None,
90+
number_of_affected_entries=1,
91+
):
8492

8593
self.assertEqual(event.key, key)
8694
self.assertEqual(event.event_type, event_type)
@@ -107,6 +115,7 @@ class SingleMemberTestCase(HazelcastTestCase):
107115
"""
108116
Test cases where a single member - client combination is needed
109117
"""
118+
110119
rc = None
111120
client = None
112121

tests/client_message_test.py

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,21 @@
66
from hazelcast.connection import _Reader
77
from hazelcast.errors import _ErrorsCodec
88
from hazelcast.protocol import ErrorHolder
9-
from hazelcast.protocol.builtin import CodecUtil, FixSizedTypesCodec, ByteArrayCodec, DataCodec, EntryListCodec, \
10-
StringCodec, EntryListUUIDListIntegerCodec, EntryListUUIDLongCodec, ListMultiFrameCodec, ListIntegerCodec, \
11-
ListLongCodec, ListUUIDCodec, MapCodec
9+
from hazelcast.protocol.builtin import (
10+
CodecUtil,
11+
FixSizedTypesCodec,
12+
ByteArrayCodec,
13+
DataCodec,
14+
EntryListCodec,
15+
StringCodec,
16+
EntryListUUIDListIntegerCodec,
17+
EntryListUUIDLongCodec,
18+
ListMultiFrameCodec,
19+
ListIntegerCodec,
20+
ListLongCodec,
21+
ListUUIDCodec,
22+
MapCodec,
23+
)
1224
from hazelcast.protocol.client_message import *
1325
from hazelcast.protocol.codec import client_authentication_codec
1426
from hazelcast.protocol.codec.custom.error_holder_codec import ErrorHolderCodec
@@ -144,9 +156,15 @@ def test_entry_list(self):
144156
EntryListCodec.encode_nullable(self.buf, None, StringCodec.encode, StringCodec.encode, True)
145157
message = self.write_and_decode()
146158
message.next_frame() # initial frame
147-
self.assertEqual(entries, EntryListCodec.decode(message, StringCodec.decode, StringCodec.decode))
148-
self.assertEqual(entries, EntryListCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode))
149-
self.assertIsNone(EntryListCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode))
159+
self.assertEqual(
160+
entries, EntryListCodec.decode(message, StringCodec.decode, StringCodec.decode)
161+
)
162+
self.assertEqual(
163+
entries, EntryListCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode)
164+
)
165+
self.assertIsNone(
166+
EntryListCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode)
167+
)
150168

151169
def test_uuid_integer_list_entry_list(self):
152170
self.mark_initial_frame_as_non_final()
@@ -200,8 +218,12 @@ def test_list(self):
200218
self.assertEqual(l, ListMultiFrameCodec.decode(message, StringCodec.decode))
201219
self.assertEqual(l, ListMultiFrameCodec.decode_nullable(message, StringCodec.decode))
202220
self.assertIsNone(ListMultiFrameCodec.decode_nullable(message, StringCodec.decode))
203-
self.assertEqual(l, ListMultiFrameCodec.decode_contains_nullable(message, StringCodec.decode))
204-
self.assertEqual([None], ListMultiFrameCodec.decode_contains_nullable(message, StringCodec.decode))
221+
self.assertEqual(
222+
l, ListMultiFrameCodec.decode_contains_nullable(message, StringCodec.decode)
223+
)
224+
self.assertEqual(
225+
[None], ListMultiFrameCodec.decode_contains_nullable(message, StringCodec.decode)
226+
)
205227

206228
def test_uuid_list(self):
207229
self.mark_initial_frame_as_non_final()
@@ -223,7 +245,9 @@ def test_map(self):
223245
message = self.write_and_decode()
224246
message.next_frame() # initial frame
225247
self.assertEqual(m, MapCodec.decode(message, StringCodec.decode, StringCodec.decode))
226-
self.assertEqual(m, MapCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode))
248+
self.assertEqual(
249+
m, MapCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode)
250+
)
227251
self.assertIsNone(MapCodec.decode_nullable(message, StringCodec.decode, StringCodec.decode))
228252

229253
def test_string(self):
@@ -262,8 +286,9 @@ def setUp(self):
262286
self.builder = ClientMessageBuilder(lambda m: self.counter.increment())
263287

264288
def test_unfragmented_message(self):
265-
request = client_authentication_codec.encode_request("dev", "user", "pass", uuid.uuid4(),
266-
"PYH", 1, "4.0", "python", [])
289+
request = client_authentication_codec.encode_request(
290+
"dev", "user", "pass", uuid.uuid4(), "PYH", 1, "4.0", "python", []
291+
)
267292
self.reader.read(request.buf)
268293
message = self.reader._read_message()
269294
self.builder.on_message(message)

tests/client_test.py

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@ def test_client_only_listens(self):
1111
rc = self.create_rc()
1212
client_heartbeat_seconds = 8
1313

14-
cluster_config = """<hazelcast xmlns="http://www.hazelcast.com/schema/config"
14+
cluster_config = (
15+
"""
16+
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
1517
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1618
xsi:schemaLocation="http://www.hazelcast.com/schema/config
1719
http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
1820
<properties>
1921
<property name="hazelcast.client.max.no.heartbeat.seconds">%s</property>
2022
</properties>
21-
</hazelcast>""" % client_heartbeat_seconds
23+
</hazelcast>"""
24+
% client_heartbeat_seconds
25+
)
2226
cluster = self.create_cluster(rc, cluster_config)
2327
cluster.start_member()
2428

@@ -45,7 +49,7 @@ def event_collector(e):
4549

4650
def message_listener(_):
4751
pass
48-
52+
4953
topic.add_listener(message_listener)
5054

5155
topic2 = client2.get_topic(key)
@@ -77,29 +81,32 @@ def tearDown(self):
7781
self.shutdown_all_clients()
7882

7983
def test_default_config(self):
80-
client = self.create_client({
81-
"cluster_name": self.cluster.id
82-
})
84+
client = self.create_client({"cluster_name": self.cluster.id})
8385
self.assertIsNone(self.get_labels_from_member(client._connection_manager.client_uuid))
8486

8587
def test_provided_labels_are_received(self):
86-
client = self.create_client({
87-
"cluster_name": self.cluster.id,
88-
"labels": [
89-
"test-label",
90-
]
91-
})
92-
self.assertEqual(b"test-label", self.get_labels_from_member(client._connection_manager.client_uuid))
88+
client = self.create_client(
89+
{
90+
"cluster_name": self.cluster.id,
91+
"labels": [
92+
"test-label",
93+
],
94+
}
95+
)
96+
self.assertEqual(
97+
b"test-label", self.get_labels_from_member(client._connection_manager.client_uuid)
98+
)
9399

94100
def get_labels_from_member(self, client_uuid):
95-
script = """var clients = instance_0.getClientService().getConnectedClients().toArray();
101+
script = """
102+
var clients = instance_0.getClientService().getConnectedClients().toArray();
96103
for (i=0; i < clients.length; i++) {
97104
var client = clients[i];
98105
if ("%s".equals(client.getUuid().toString())) {
99106
result = client.getLabels().iterator().next();
100107
break;
101108
}
102-
}
103-
""" % str(client_uuid)
109+
}""" % str(
110+
client_uuid
111+
)
104112
return self.rc.executeOnController(self.cluster.id, script, Lang.JAVASCRIPT).result
105-

tests/cluster_test.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ def member_added(m):
3232
events.append(m)
3333

3434
config = self.create_config()
35-
config["membership_listeners"] = [
36-
(member_added, None)
37-
]
35+
config["membership_listeners"] = [(member_added, None)]
3836

3937
member = self.cluster.start_member()
4038

@@ -109,9 +107,7 @@ def listener(_):
109107
raise RuntimeError("error")
110108

111109
config = self.create_config()
112-
config["membership_listeners"] = [
113-
(listener, listener)
114-
]
110+
config["membership_listeners"] = [(listener, listener)]
115111
self.cluster.start_member()
116112
self.create_client(config)
117113

@@ -127,7 +123,9 @@ def test_cluster_service_get_members_with_selector(self):
127123
config = self.create_config()
128124
client = self.create_client(config)
129125

130-
self.assertEqual(0, len(client.cluster_service.get_members(lambda m: member.address != m.address)))
126+
self.assertEqual(
127+
0, len(client.cluster_service.get_members(lambda m: member.address != m.address))
128+
)
131129

132130

133131
class _MockClusterService(object):
@@ -237,7 +235,9 @@ def test_when_member_started_with_another_port_and_the_same_uuid(self):
237235
added_listener = event_collector()
238236
removed_listener = event_collector()
239237

240-
self.client.cluster_service.add_listener(member_added=added_listener, member_removed=removed_listener)
238+
self.client.cluster_service.add_listener(
239+
member_added=added_listener, member_removed=removed_listener
240+
)
241241

242242
self.rc.shutdownCluster(self.cluster.id)
243243
# now stop cluster, restart it with the same name and then start member with port 5702
@@ -267,4 +267,7 @@ def _get_config(self, port):
267267
<hot-restart-persistence enabled="true">
268268
<base-dir>%s</base-dir>
269269
</hot-restart-persistence>
270-
</hazelcast>""" % (port, self.tmp_dir)
270+
</hazelcast>""" % (
271+
port,
272+
self.tmp_dir,
273+
)

0 commit comments

Comments
 (0)