saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix multimaster tests when using zeromq transport

Browse source
This commit is contained in:
Daniel A. Wozniak 2022-02-10 14:20:37 -07:00 • committed by Gareth J. Greenaway
parent 3b8db4e7d6
commit f6ca55a2d7
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/minion.py
View file

@ -2812,6 +2812,13 @@ class Minion(MinionBase):
"Re-initialising subsystems for new master %s",
self.opts["master"],
)
self.req_channel = (
salt.transport.client.AsyncReqChannel.factory(
self.opts, io_loop=self.io_loop
)
)
# put the current schedule into the new loaders
self.opts["schedule"] = self.schedule.option("schedule")
(

14
tests/filename_map.yml
View file

@ -275,5 +275,19 @@ salt/utils/vt.py:
salt/wheel/*:
- integration.wheel.test_client
salt/(minion\.py|channel/.+|transport/.+):
- pytests.scenarios.multimaster.test_multimaster
- pytests.scenarios.multimaster.test_offline_master
- pytests.scenarios.multimaster.beacons.test_inotify
- pytests.scenarios.multimaster.modules.test_test
- pytests.scenarios.failover.multimaster.test_failover_master
tests/support/mock.py:
- unit.test_mock
tests/pytests/scenarios/multimaster:
- pytests.scenarios.multimaster.test_multimaster
- pytests.scenarios.multimaster.test_offline_master
- pytests.scenarios.multimaster.beacons.test_inotify
- pytests.scenarios.multimaster.modules.test_test
- pytests.scenarios.failover.multimaster.test_failover_master