13 commits

Author	SHA1	Message	Date
Pedro Algarvio	967d3015f6	Merge 3006.x into master	2023-12-05 18:10:58 +00:00
Daniel A. Wozniak	3faee7dc28	Add master_uri to minion_opts for tests	2023-12-04 14:20:01 -07:00
Pedro Algarvio	0971af9331	Some tests require TCPPubClient to be mocked. ... This prevents the tests from hanging on Windows, and slowing down on Linux. Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>	2023-10-11 08:13:07 +01:00
MKLeb	bee29be6dd	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
Daniel A. Wozniak	771abcb739	Syndic's async request channel is actually async	2023-08-28 07:42:41 +01:00
Daniel A. Wozniak	13190ff89a	Use fixtures when already present	2023-08-08 14:47:15 -07:00
Megan Wilhite	3a42b0ce58	Remove onedir pytest fixture workaround	2023-08-04 16:29:46 +01:00
Megan Wilhite	a6ff8d0c23	Move _pkg.txt into salt directory	2023-08-04 16:29:46 +01:00
Megan Wilhite	dc07caab95	ensure we unset ONEDIR env for unit/functional tests	2023-08-04 16:29:46 +01:00
Pedro Algarvio	32a7c51b40	f ... Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>	2023-05-31 14:39:59 +00:00
Pedro Algarvio	e93c86ccf3	Migrate tests/unit/test_template.py to pytest ... Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>	2023-05-31 14:39:59 +00:00
Pedro Algarvio	673143e702	Add master_opts fixture under tests/pytests/unit ... Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>	2022-11-18 12:36:51 -07:00
Pedro Algarvio	c1558ae7e7	minion_opts fixture is now available for all tests under tests/pytests/unit ... Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>	2022-11-18 12:36:51 -07:00