mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Revert "fix pre-commit"
This reverts commit 9f779c68cfef5683fc8ffc2cf7f39a94366a4fe1.
This commit is contained in:
Insoo Ha
Pedro Algarvio
parent
95bccf06c2
commit
13cfa9341f
4 changed files with 36 additions and 45 deletions
|
|
@ -1 +1 @@
|
|||
Use `send_multipart` instead of `send` when sending multipart message.
|
||||
Use `send_multipart` instead of `send` when sending multipart message.
|
||||
|
|
@ -69,6 +69,10 @@ cachetools==4.2.2
|
|||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# google-auth
|
||||
# python-telegram-bot
|
||||
cassandra-driver==3.23.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
certifi==2023.07.22
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
|
|
@ -303,6 +307,12 @@ looseversion==1.0.2
|
|||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# -r requirements/base.txt
|
||||
lxml==4.9.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# junos-eznc
|
||||
# napalm
|
||||
# ncclient
|
||||
mako==1.2.2
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
from contextlib import contextmanager
|
||||
import copy
|
||||
import logging
|
||||
import random
|
||||
import threading
|
||||
import time
|
||||
from contextlib import contextmanager
|
||||
import threading
|
||||
|
||||
import pytest
|
||||
from saltfactories.utils import random_string
|
||||
|
||||
from saltfactories.utils import random_string
|
||||
import salt.transport.zeromq
|
||||
import salt.utils.process
|
||||
|
||||
from tests.support.mock import MagicMock, patch
|
||||
from tests.support.pytest.transport import PubServerChannelProcess
|
||||
|
||||
|
|
@ -41,13 +42,9 @@ def generate_msg_list(msg_cnt, minions_list, broadcast):
|
|||
for i in range(msg_cnt):
|
||||
for idx, minion_id in enumerate(minions_list):
|
||||
if broadcast:
|
||||
msg_list.append(
|
||||
{"tgt_type": "grain", "tgt": "id:*", "jid": msg_cnt * idx + i}
|
||||
)
|
||||
msg_list.append({"tgt_type": "grain", "tgt": 'id:*', "jid": msg_cnt * idx + i})
|
||||
else:
|
||||
msg_list.append(
|
||||
{"tgt_type": "list", "tgt": [minion_id], "jid": msg_cnt * idx + i}
|
||||
)
|
||||
msg_list.append({"tgt_type": "list", "tgt": [minion_id], "jid": msg_cnt * idx + i})
|
||||
return msg_list
|
||||
|
||||
|
||||
|
|
@ -57,9 +54,7 @@ def channel_publisher_manager(msg_list, p_cnt, pub_server_channel):
|
|||
msg_list = copy.deepcopy(msg_list)
|
||||
random.shuffle(msg_list)
|
||||
batch_size = len(msg_list) // p_cnt
|
||||
list_batch = [
|
||||
[x * batch_size, x * batch_size + batch_size] for x in range(0, p_cnt)
|
||||
]
|
||||
list_batch = [[x * batch_size, x * batch_size + batch_size] for x in range(0, p_cnt)]
|
||||
list_batch[-1][1] = list_batch[-1][1] + 1
|
||||
try:
|
||||
for i, j in list_batch:
|
||||
|
|
@ -108,9 +103,7 @@ def test_zeromq_filtering_minion(salt_master, salt_minion):
|
|||
),
|
||||
):
|
||||
with PubServerChannelProcess(opts, minion_opts) as server_channel:
|
||||
with channel_publisher_manager(
|
||||
msg_list, workers, server_channel.pub_server_channel
|
||||
):
|
||||
with channel_publisher_manager(msg_list, workers, server_channel.pub_server_channel):
|
||||
cnt = 0
|
||||
last_results_len = 0
|
||||
while cnt < 20:
|
||||
|
|
@ -121,9 +114,8 @@ def test_zeromq_filtering_minion(salt_master, salt_minion):
|
|||
last_results_len = results_len
|
||||
cnt += 1
|
||||
results = set(server_channel.collector.results)
|
||||
assert (
|
||||
results == expect
|
||||
), f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
assert results == expect, \
|
||||
f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
|
||||
|
||||
@pytest.mark.skip_on_windows
|
||||
|
|
@ -140,7 +132,7 @@ def test_zeromq_filtering_syndic(salt_master, salt_minion):
|
|||
minion_opts = dict(
|
||||
salt_minion.config.copy(),
|
||||
zmq_filtering=True,
|
||||
__role="syndic",
|
||||
__role='syndic',
|
||||
)
|
||||
messages = 200
|
||||
workers = 5
|
||||
|
|
@ -161,9 +153,7 @@ def test_zeromq_filtering_syndic(salt_master, salt_minion):
|
|||
),
|
||||
):
|
||||
with PubServerChannelProcess(opts, minion_opts) as server_channel:
|
||||
with channel_publisher_manager(
|
||||
msg_list, workers, server_channel.pub_server_channel
|
||||
):
|
||||
with channel_publisher_manager(msg_list, workers, server_channel.pub_server_channel):
|
||||
cnt = 0
|
||||
last_results_len = 0
|
||||
while cnt < 20:
|
||||
|
|
@ -174,9 +164,8 @@ def test_zeromq_filtering_syndic(salt_master, salt_minion):
|
|||
last_results_len = results_len
|
||||
cnt += 1
|
||||
results = set(server_channel.collector.results)
|
||||
assert (
|
||||
results == expect
|
||||
), f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
assert results == expect, \
|
||||
f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
|
||||
|
||||
@pytest.mark.skip_on_windows
|
||||
|
|
@ -216,9 +205,7 @@ def test_zeromq_filtering_broadcast(salt_master, salt_minion):
|
|||
),
|
||||
):
|
||||
with PubServerChannelProcess(opts, minion_opts) as server_channel:
|
||||
with channel_publisher_manager(
|
||||
msg_list, workers, server_channel.pub_server_channel
|
||||
):
|
||||
with channel_publisher_manager(msg_list, workers, server_channel.pub_server_channel):
|
||||
cnt = 0
|
||||
last_results_len = 0
|
||||
while cnt < 20:
|
||||
|
|
@ -229,9 +216,8 @@ def test_zeromq_filtering_broadcast(salt_master, salt_minion):
|
|||
last_results_len = results_len
|
||||
cnt += 1
|
||||
results = set(server_channel.collector.results)
|
||||
assert (
|
||||
results == expect
|
||||
), f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
assert results == expect, \
|
||||
f"{len(results)}, != {len(expect)}, difference: {expect.difference(results)} {results}"
|
||||
|
||||
|
||||
def test_pub_channel(master_opts):
|
||||
|
|
|
|||
|
|
@ -42,9 +42,7 @@ class Collector(salt.utils.process.SignalHandlingProcess):
|
|||
):
|
||||
super().__init__()
|
||||
self.minion_config = minion_config
|
||||
self.hexid = hashlib.sha1(
|
||||
salt.utils.stringutils.to_bytes(self.minion_config["id"])
|
||||
).hexdigest()
|
||||
self.hexid = hashlib.sha1(salt.utils.stringutils.to_bytes(self.minion_config["id"])).hexdigest()
|
||||
self.interface = interface
|
||||
self.port = port
|
||||
self.aes_key = aes_key
|
||||
|
|
@ -53,7 +51,7 @@ class Collector(salt.utils.process.SignalHandlingProcess):
|
|||
self.hard_timeout = time.time() + timeout + 120
|
||||
self.manager = multiprocessing.Manager()
|
||||
self.results = self.manager.list()
|
||||
self.zmq_filtering = minion_config["zmq_filtering"]
|
||||
self.zmq_filtering = minion_config['zmq_filtering']
|
||||
self.stopped = multiprocessing.Event()
|
||||
self.started = multiprocessing.Event()
|
||||
self.running = multiprocessing.Event()
|
||||
|
|
@ -89,9 +87,7 @@ class Collector(salt.utils.process.SignalHandlingProcess):
|
|||
if self.minion_config.get("__role") == "syndic":
|
||||
self.sock.setsockopt(zmq.SUBSCRIBE, b"syndic")
|
||||
else:
|
||||
self.sock.setsockopt(
|
||||
zmq.SUBSCRIBE, salt.utils.stringutils.to_bytes(self.hexid)
|
||||
)
|
||||
self.sock.setsockopt(zmq.SUBSCRIBE, salt.utils.stringutils.to_bytes(self.hexid))
|
||||
else:
|
||||
self.sock.setsockopt(zmq.SUBSCRIBE, b"")
|
||||
pub_uri = "tcp://{}:{}".format(self.interface, self.port)
|
||||
|
|
@ -124,12 +120,11 @@ class Collector(salt.utils.process.SignalHandlingProcess):
|
|||
message_target = salt.utils.stringutils.to_str(messages[0])
|
||||
is_syndic = self.minion_config.get("__role") == "syndic"
|
||||
if (
|
||||
not is_syndic
|
||||
and message_target not in ("broadcast", self.hexid)
|
||||
) or (is_syndic and message_target not in ("broadcast", "syndic")):
|
||||
log.debug(
|
||||
"Publish received for not this minion: %s", message_target
|
||||
)
|
||||
not is_syndic and message_target not in ("broadcast", self.hexid)
|
||||
) or (
|
||||
is_syndic and message_target not in ("broadcast", "syndic")
|
||||
):
|
||||
log.debug("Publish received for not this minion: %s", message_target)
|
||||
raise salt.ext.tornado.gen.Return(None)
|
||||
serial_payload = salt.payload.loads(messages[1])
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue