93867 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	7dce7cde14	Explictly document the configuration override priority	2018-08-02 11:19:22 -05: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	fb7885315c	Wrap ElementTree.tostring to make strs, not bytes ... This is in use on a setup running python3 right now. Without this patch, assertions were thrown by python3-libvirt code that expected strings, not bytes.	2018-08-01 20:21:04 -04:00
Toyam Cox	a4905b0e5d	Make IP_LEARNING optional	2018-08-01 20:11:15 -04:00
Daniel Wozniak	d4bb3a0963	Merge pull request #48871 from dwoz/test_cleanup ... Remove unicode key pairs from environ after test	2018-08-01 15:33:40 -07:00
Daniel A. Wozniak	f2e15e7f1d	Do not re-define tearDown	2018-08-01 15:11:29 -07:00
Daniel A. Wozniak	4f8a191a69	Remove unicode key pairs from environ after test	2018-08-01 14:28:57 -07: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
Nicole Thomas	bec79e83a3	Merge pull request #48843 from isbm/isbm-log-level-names-fix-2 ... Prevent u'something' to appear in help info.	2018-08-01 16:38:57 -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	a8376b537a	Merge pull request #48855 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-01 13:44:58 -04:00
rallytime	44998c208e	Lint: Fix undefined logger variable	2018-08-01 10:05:14 -04:00
rallytime	92c9317a25	Update old utils paths to use new paths	2018-07-31 18:20:35 -04:00
rallytime	15bfba7143	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/slsutil.py - salt/modules/win_timezone.py - salt/states/pkg.py - tests/integration/states/test_pkg.py	2018-07-31 18:18:58 -04:00
Nicole Thomas	e23ba01cd2	Merge pull request #48830 from garethgreenaway/48659_file_grep_glob_fix ... [2018.3] Fixes to file.grep	2018-07-31 17:30:03 -04:00
Nicole Thomas	a63686180d	Merge branch '2018.3' into isbm-log-level-names-fix-2	2018-07-31 17:29:20 -04:00
Nicole Thomas	9fda70b3d0	Merge pull request #48814 from isbm/isbm-2018.3-smbios-bugfix ... dmidecode race conditions check	2018-07-31 16:48:28 -04:00
Nicole Thomas	3d16a63ff2	Merge pull request #48804 from Ch3LL/mac_brew ... Use brew path from which cmd in mac_brew module	2018-07-31 16:24:32 -04:00
Nicole Thomas	950c1014aa	Merge pull request #48836 from dwoz/unicode_names_py2 ... Fix unicode directory listing on py2	2018-07-31 16:22: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
Daniel Wallace	5b443af7ae	add key-deploy test	2018-07-31 13:36:43 -05:00
Nicole Thomas	baf8c5784a	Merge pull request #48847 from terminalmage/issue48695 ... Update file.blockreplace docs to reflect changed functionality	2018-07-31 14:11:29 -04:00
Nicole Thomas	644a1f4ff8	Merge pull request #48587 from twangboy/fix_lgpo ... Fix lgpo issue on Py3	2018-07-31 14:05:57 -04:00
Erik Johnson	e2bdf7fb92	Update file.blockreplace docs to reflect changed functionality ... See https://github.com/saltstack/salt/issues/48695#issuecomment-407414810	2018-07-31 12:50:28 -05: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
Nicole Thomas	2bacc23481	Merge pull request #48796 from Ch3LL/remove_su ... Remove fake su used in integration tests	2018-07-31 13:08:53 -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
Gareth J. Greenaway	0791b0a03c	FileGrepTestCase tests back to 2018.3	2018-07-31 09:33:58 -07:00
Gareth J. Greenaway	2e01c55e7e	Fixing a bug that prevents specifying wildcards for filenames.	2018-07-31 09:33:58 -07:00
Daniel Wallace	a131c9beeb	Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh	2018-07-31 11:30:25 -05:00
Nicole Thomas	e818c752b3	Merge branch '2018.3' into mac_brew	2018-07-31 12:28:36 -04:00
Nicole Thomas	5f1141dc05	Merge branch '2018.3' into isbm-2018.3-smbios-bugfix	2018-07-31 12:28:01 -04:00
Daniel A. Wozniak	47e158b9f0	Optomize if statement	2018-07-31 09:26:13 -07:00
Nicole Thomas	00d06bda76	Merge pull request #48689 from linoplt/fix_38310_pygit2_checkout_ext_pillar_remote_using_tag ... Fix ext_pillar remote checkout using tag (pygit2)	2018-07-31 12:15:58 -04:00