86562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	24d5e6a22f	Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS	2018-08-03 21:36:59 -07:00
Nicole Thomas	0c3d2c6a09	Merge pull request #48922 from rallytime/cache-doc-error ... Update backticks on job_cache docs	2018-08-03 17:05:45 -04:00
Nicole Thomas	8d1fc4f8e5	Merge pull request #48866 from Ch3LL/cmd_win_tests ... Add cmd module integration tests for windows and fix space in path issue	2018-08-03 17:03:32 -04:00
Nicole Thomas	905da13653	Merge branch '2017.7' into cmd_win_tests	2018-08-03 15:10:29 -04:00
rallytime	8ca89df7e8	Update backticks on job_cache docs ... There's an extra backtick after the `job_cache` link, and not enough backticks around `keep_jobs` parameter.	2018-08-03 12:03:37 -04:00
Daniel Wallace	57d58e7541	Merge pull request #48920 from rallytime/bp-48904-2017.7 ... Back-port #48904 to 2017.7	2018-08-03 10:17:06 -05:00
William Giokas	a55f92954a	No rehashing in parallel ... Rehashing in parallel causes pyenv to fail, if they're run at almost the exact same time. It's breaking our lint tests pretty horribly.	2018-08-03 10:50:54 -04:00
Nicole Thomas	e79ccb35b1	Merge pull request #48876 from Vaelatern/make-network-learning-optional ... Make IP_LEARNING optional	2018-08-02 15:30:23 -04:00
Nicole Thomas	f8bfab4f9f	Merge pull request #48890 from Ch3LL/cmd_test ... add sleep in test_cmd integration test	2018-08-02 15:15:07 -04:00
Nicole Thomas	52722f6ded	Merge pull request #48885 from rallytime/flaky-tests-shadow ... Mark shadow module integration test as flaky	2018-08-02 15:04:34 -04:00
Nicole Thomas	bf0895656e	Merge pull request #48884 from rallytime/flaky-tests-matchers ... Separate compound matcher tests into individual tests	2018-08-02 15:04:02 -04:00
Ch3LL	acda4ed9ab	add sleep in test_cmd integration test	2018-08-02 13:36:33 -04:00
Nicole Thomas	38d9eae537	Merge branch '2017.7' into flaky-tests-matchers	2018-08-02 13:29:57 -04:00
Nicole Thomas	a567666938	Merge pull request #48868 from terminalmage/fix-loader-race ... Fix race when SIGTERM/SIGINT received while lazyloading a module	2018-08-02 13:13:33 -04:00
Nicole Thomas	0ca0b6f2f2	Merge pull request #48883 from terminalmage/salt-jenkins-1023 ... Fix failing git worktree tests	2018-08-02 12:51:39 -04:00
rallytime	da871a2d57	Mark shadow module integration test as flaky ... This test fails sometimes, so let's mark it as flaky. I have tried to reproduce the failure and fix it, but to no avail. Let's mark it as flaky for now.	2018-08-02 11:12:35 -04:00
rallytime	3660dff13c	Separate compound matcher tests into individual tests ... When one match fails (and some of these can be flaky) the whole test fails. This makes it somewhat difficult to track down why the test fails. I am hoping we won't need the sleeps in this change when the tests are separate, but let's see how that goes. It worked fine in my testing. I also updated the test to use pytest notation, rather than unittest.	2018-08-02 10:42:03 -04:00
Ch3LL	3be11e06fe	Add docs for new escape kwarg	2018-08-02 10:37:25 -04:00
Erik Johnson	c61f75cb50	Fix failing git worktree tests ... Git 2.18.0 changed the output format against which some of the asserts in this test are performed. Instead of displaying the full path to the worktree, it now references the branch name instead. This test updates the asserts to look for the basename instead, which should allow it to pass on Git releases both before and after 2.18.0.	2018-08-02 09:26:27 -05:00
Nicole Thomas	a84f5155a1	Merge pull request #48869 from Ch3LL/mac_shell_tests ... Catch socket.error exception in testprogram	2018-08-02 10:19:22 -04:00
Toyam Cox	a4905b0e5d	Make IP_LEARNING optional	2018-08-01 20:11:15 -04:00
Nicole Thomas	7f56b8bf44	Merge pull request #48867 from rallytime/skip-tornado-test ... Skip unreliable tornado test.	2018-08-01 17:07:06 -04:00
Ch3LL	3734b1ec89	Catch socket.error exception in testprogram	2018-08-01 16:35:16 -04:00
Erik Johnson	5f1169b9a2	Fix race when SIGTERM/SIGINT received while lazyloading a module ... This try/except block is designed to keep some bozo from putting a sys.exit() in their code and causing the minion to stop. The stack from the exception is inspected, and if our signal handling ran the sys.exit() then we re-run that sys.exit().	2018-08-01 15:08:40 -05:00
rallytime	7320aa9104	Skip unreliable tornado test. ... Even with the flaky decorator, it still fails _sometimes_. This is not a useful test as it sits. Skipping it for now.	2018-08-01 15:46:03 -04:00
Ch3LL	391bb8a411	use a specific path for just the cmd._run call	2018-08-01 15:03:46 -04:00
Ch3LL	62c66ba489	make sure we lower the check on shell	2018-08-01 14:22:04 -04:00
Ch3LL	9312a993a5	Add cmd module integration tests for windows and fix space in path issue	2018-08-01 14:05:52 -04:00
Nicole Thomas	05f2d65de3	Merge pull request #48853 from rallytime/bp-48850 ... Back-port #48850 to 2017.7	2018-07-31 16:21:48 -04:00
Nicole Thomas	8a1285239a	Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed ... [2017.7] fixes to states/pkg.py	2018-07-31 16:18:04 -04:00
rallytime	3c33ee554a	Skip tests in integration.shell.test_master ... Related to https://github.com/saltstack/salt-jenkins/issues/378 This is likely causing all of the flakiness we're seeing on test runs when the master stops responding. These tests should be in their own, isolated run, rather than with the rest of the test suite.	2018-07-31 15:22:34 -04:00
Nicole Thomas	c8e69431ff	Merge pull request #47734 from OrlandoArcapix/Issue47689-pip-state-performance ... #47689 improve run-speed of pip package state	2018-07-31 15:15:34 -04:00
Nicole Thomas	83a5b3cc47	Merge pull request #48844 from AVeenstra/fix-python3-incompatibility ... Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.	2018-07-31 13:20:26 -04:00
Gareth J. Greenaway	9b0f5dd212	Fixing identation, removing some unnecessary conditionals.	2018-07-31 09:46:06 -07:00
Gareth J. Greenaway	727964ab55	One last cleanup.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	11cb86e6eb	General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	16fb6ae635	Make sure pkg.hold and pkg.unhold are available before running the test.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	998651102d	Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic.	2018-07-31 09:46:05 -07:00
Nicole Thomas	136ff6735a	Merge pull request #48662 from slaws/fix-retention-schedule-48637 ... Excluding relative dirs in state.file.retention_schedule	2018-07-31 12:15:08 -04:00
Nicole Thomas	1fc04f281b	Merge pull request #48840 from gtmanfred/docs ... fix links in pkg doc.	2018-07-31 12:13:00 -04:00
AVeenstra	f238779a62	Merge branch '2017.7' into fix-python3-incompatibility	2018-07-31 16:42:36 +02:00
Daniel Wallace	8d2d268c4a	fix links in pkg doc. ... Closes #48818	2018-07-31 09:14:59 -05:00
Nicole Thomas	662bd1f780	Merge branch '2017.7' into Issue47689-pip-state-performance	2018-07-31 10:04:28 -04:00
Nicole Thomas	0a19f845ea	Merge pull request #48834 from gtmanfred/slsutil ... read output of stringio if it is readable	2018-07-31 09:40:47 -04:00
Veenstra	6b1805afc6	Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.	2018-07-31 13:08:01 +02:00
Daniel Wallace	f9441d2bef	read output of stringio if it is readable	2018-07-30 19:49:49 -05:00
Orlando Richards	66936b4f41	Changed string comparison in pip test to match new confirmation string - ref PR #47734.	2018-07-29 21:32:24 +00:00
Orlando Richards	bb5939d6ef	Merge branch '2017.7' into Issue47689-pip-state-performance	2018-07-29 22:04:23 +01:00
Nicole Thomas	2e00939a6e	Merge pull request #48788 from Ch3LL/timezone_windows ... Add timzeone windows integration tests and fix get_zone	2018-07-27 16:14:29 -04:00
Ch3LL	de95a6a215	add unused import to timezone test file	2018-07-27 15:42:35 -04:00