mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Prevent test hangs on windows
This commit is contained in:
parent
d51f3b9cc5
commit
9bede19920
1 changed files with 64 additions and 54 deletions
|
@ -86,22 +86,24 @@ def test_list():
|
|||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert {"test_event/*": ["/srv/reactors/reactor.sls"]} in ret
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert {"test_event/*": ["/srv/reactors/reactor.sls"]} in ret
|
||||
|
||||
event_returns = {
|
||||
"_stamp": "2020-09-04T16:51:52.577711",
|
||||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert ret is None
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert ret is None
|
||||
|
||||
mock_opts = {}
|
||||
mock_opts["reactor"] = [{"test_event/*": ["/srv/reactors/reactor.sls"]}]
|
||||
|
@ -112,11 +114,12 @@ def test_list():
|
|||
"_stamp": "2020-09-04T16:51:52.577711",
|
||||
}
|
||||
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert {"test_event/*": ["/srv/reactors/reactor.sls"]} in ret
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.list_()
|
||||
assert {"test_event/*": ["/srv/reactors/reactor.sls"]} in ret
|
||||
|
||||
|
||||
def test_add():
|
||||
|
@ -132,11 +135,12 @@ def test_add():
|
|||
mock_opts = {}
|
||||
mock_opts = {"engines": []}
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with pytest.raises(CommandExecutionError) as excinfo:
|
||||
ret = reactor.add(
|
||||
"salt/cloud/*/destroyed", reactors="/srv/reactor/destroy/*.sls"
|
||||
)
|
||||
assert excinfo.value.error == "Reactor system is not running."
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with pytest.raises(CommandExecutionError) as excinfo:
|
||||
ret = reactor.add(
|
||||
"salt/cloud/*/destroyed", reactors="/srv/reactor/destroy/*.sls"
|
||||
)
|
||||
assert excinfo.value.error == "Reactor system is not running."
|
||||
|
||||
mock_opts = {}
|
||||
mock_opts["engines"] = [
|
||||
|
@ -156,13 +160,14 @@ def test_add():
|
|||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.add("test_event/*", "/srv/reactor/reactor.sls")
|
||||
assert "status" in ret
|
||||
assert ret["status"]
|
||||
assert "Reactor added." == ret["comment"]
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.add("test_event/*", "/srv/reactor/reactor.sls")
|
||||
assert "status" in ret
|
||||
assert ret["status"]
|
||||
assert "Reactor added." == ret["comment"]
|
||||
|
||||
event_returns = {
|
||||
"reactors": [{"test_event/*": ["/srv/reactors/reactor.sls"]}],
|
||||
|
@ -170,11 +175,12 @@ def test_add():
|
|||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.add("test_event/*", "/srv/reactor/reactor.sls")
|
||||
assert ret is None
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.add("test_event/*", "/srv/reactor/reactor.sls")
|
||||
assert ret is None
|
||||
|
||||
|
||||
def test_delete():
|
||||
|
@ -210,13 +216,14 @@ def test_delete():
|
|||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.delete("test_event/*")
|
||||
assert "status" in ret
|
||||
assert ret["status"]
|
||||
assert "Reactor deleted." == ret["comment"]
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.delete("test_event/*")
|
||||
assert "status" in ret
|
||||
assert ret["status"]
|
||||
assert "Reactor deleted." == ret["comment"]
|
||||
|
||||
event_returns = {
|
||||
"reactors": [{"bot/*": ["/srv/reactors/bot.sls"]}],
|
||||
|
@ -224,11 +231,12 @@ def test_delete():
|
|||
}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.delete("test_event/*")
|
||||
assert ret is None
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.delete("test_event/*")
|
||||
assert ret is None
|
||||
|
||||
|
||||
def test_is_leader():
|
||||
|
@ -260,11 +268,12 @@ def test_is_leader():
|
|||
event_returns = {"result": True, "_stamp": "2020-09-04T18:32:10.004490"}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.is_leader()
|
||||
assert ret
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.is_leader()
|
||||
assert ret
|
||||
|
||||
|
||||
def test_set_leader():
|
||||
|
@ -296,8 +305,9 @@ def test_set_leader():
|
|||
event_returns = {"result": True, "_stamp": "2020-09-04T18:32:10.004490"}
|
||||
|
||||
with patch.dict(reactor.__opts__, mock_opts):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.set_leader()
|
||||
assert ret
|
||||
with patch.object(SaltEvent, "connect_pub", return_value=True):
|
||||
with patch.object(SaltEvent, "get_event", return_value=event_returns):
|
||||
with patch("salt.utils.master.get_master_key") as get_master_key:
|
||||
get_master_key.retun_value = MagicMock(retun_value="master_key")
|
||||
ret = reactor.set_leader()
|
||||
assert ret
|
||||
|
|
Loading…
Add table
Reference in a new issue