12584 Commits

Author	SHA1	Message	Date
Daniel Wallace	75425dfd20	fix tests for localemod	2018-04-04 09:58:21 -05:00
Erik Johnson	f8f9d045ac	Add regression test	2018-03-30 13:12:02 -05:00
rallytime	e8864b7b0b	Merge branch '2017.7' into '2018.3'	2018-03-28 13:52:28 -04:00
Nicole Thomas	bd1e8bcc7d	Merge pull request #46734 from terminalmage/busybox ... Make busybox image builder work with newer busybox releases	2018-03-27 17:14:28 -04:00
Nicole Thomas	c09c6f819c	Merge pull request #46742 from gtmanfred/2017.7 ... only use npm test work around on newer versions	2018-03-27 17:13:28 -04:00
rallytime	d0278345fc	Update old utils paths to new utils paths	2018-03-27 16:45:16 -04:00
rallytime	e312efb5e7	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/modules/cmdmod.py - salt/modules/pillar.py - salt/modules/yumpkg.py - salt/state.py - salt/utils/pkg/rpm.py - salt/utils/schedule.py - tests/integration/states/test_npm.py - tests/integration/states/test_pkgrepo.py	2018-03-27 16:31:55 -04:00
Ch3LL	4f1c42c0e3	Workaround getpwnam in auth test for MacOSX	2018-03-27 15:18:29 -04:00
Daniel Wallace	fd0e649d1e	only use npm test work around on newer versions ... The workaround only needs to be applied to versions of npm newer than 5.1, but they work with versions newer than 5.0, so just do all newer versions using the work around	2018-03-27 13:51:21 -05:00
Erik Johnson	6502b6b4ff	Make busybox image builder work with newer busybox releases	2018-03-27 10:55:52 -05:00
rallytime	00d4eb26f3	Merge branch '2018.3.0rc1' into '2018.3' ... Conflicts: - pkg/windows/req.txt	2018-03-27 11:41:56 -04:00
Nicole Thomas	3f21e9cc65	Merge pull request #46503 from psyer/fix-cmd-run-env-corrupt ... Fixes stdout user environment corruption	2018-03-27 10:20:14 -04:00
Gareth J. Greenaway	042930bd3b	A couple more fixes to ensure everything works consistently under python2 and python3, adjusting things that should be bytes and things that should be strings. Updating tests to reflect changes.	2018-03-26 21:51:51 -07:00
Nicole Thomas	0faced1d54	Merge pull request #46565 from twangboy/win_fix_cmd_powershell_2018.3 ... Create reg salt util (2018.3)	2018-03-26 18:03:33 -04:00
twangboy	5ee64e9b0e	Fix lint (spelling error)	2018-03-26 13:02:53 -06:00
Nicole Thomas	fadc5e4ba4	Merge pull request #46669 from terminalmage/pillar-merge-order ... Add option to return to pre-2017.7.3 pillar include merge order	2018-03-26 15:00:27 -04:00
Nicole Thomas	84579e7652	Merge pull request #46643 from mcalmer/fix-docker-return ... fix docker return	2018-03-26 11:52:31 -04:00
Nicole Thomas	6c80d90bb6	Merge pull request #46693 from dwoz/test_smtp_return ... File and Pillar roots are dictionaries	2018-03-26 11:15:37 -04:00
Nicole Thomas	c67afbeb36	Merge pull request #46650 from Ch3LL/nacl_test ... Mirror libnacl imports in test from the nacl module	2018-03-26 10:48:39 -04:00
Nicole Thomas	47409eaa6e	Merge pull request #46646 from twangboy/win_fix_test_local_cache ... Fix `unit.returners.test_local_cache` for Windows	2018-03-26 10:16:22 -04:00
Erik Johnson	71a1d2b40a	Fix batch tests on Python 3	2018-03-26 08:56:54 -05:00
Gareth J. Greenaway	19fd2b621a	Fixing integration tests that were failing.	2018-03-25 17:39:33 -07:00
Gareth J. Greenaway	d2672f0db9	Adding issue-46672.sls for new state.py test.	2018-03-24 10:07:50 -07:00
Gareth J. Greenaway	e721168dc4	removing salt.utils.stringutils.to_unicode from output/highstate.py and adding encoding=utf-8 to events payloads.	2018-03-23 19:09:20 -07:00
Daniel A. Wozniak	5bf850c67f	File and Pillar roots are dictionaries ... Fixes test_smtp_return test cases.	2018-03-23 11:42:14 -07:00
twangboy	0de54ed953	Additional tests ... Adds additional tests for unicode scenarios Fixes an issue with reg.py when deleting unicode keys Puts the destructive tests in a try/except block so the delete occurs no matter what Uses a randomly generated key name for testing	2018-03-22 15:59:46 -06:00
twangboy	fc9ecd75e2	Skip unit.state.test_reg unless on Windows	2018-03-22 14:29:35 -06:00
twangboy	e0d201a96f	Make sure the docs are correct for the tests	2018-03-22 14:29:34 -06:00
twangboy	f15f92318d	Add tests for salt.utils.win_reg ... Fix some issues found in testing	2018-03-22 14:29:34 -06:00
Erik Johnson	b4a1d34b47	Add option to return to pre-2017.7.3 pillar include merge order ... https://github.com/saltstack/salt/pull/45025 changed the pillar include merge order. This adds a new config option which allows a user to revert to the pre-2017.7.3 behavior.	2018-03-22 13:35:12 -05:00
Michael Calmer	3ceb63f607	fix checking test results	2018-03-22 16:31:46 +01:00
Michael Calmer	af64632bf3	add unit test for failed login	2018-03-22 08:57:16 +01:00
Mike Place	2e1f7c37f7	Merge pull request #46569 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-03-21 20:57:04 +00:00
Mike Place	33af3cfc7c	Merge pull request #46631 from rallytime/update-pillar-unit-tests ... Fix pillar unit test failures: file_roots and pillar_roots environments should be lists	2018-03-21 19:22:48 +00:00
Ch3LL	9fef8bc431	Mirror libnacl imports in test from the nacl runner	2018-03-21 15:18:58 -04:00
Ch3LL	f11d58a8e9	Mirror libnacl imports in test from the nacl module	2018-03-21 15:10:46 -04:00
twangboy	8d93156604	Fix unit.returners.test_local_cache for Windows ... time.time is only precise to 3 decimal places in Windows. This adds a sleep for .25 seconds to allow the test to pass Also fixes a lint error	2018-03-21 16:00:52 +00:00
Erik Johnson	e8582e80f2	Python 3-compatibility fix to unit test ... This should not be returning a string type for stderr, since Popen.communicate() returns a bytestring. In Python 2, the str and bytes types are the same, but the same is not true in Python 3. Additionally, the mocking here seems not to consider the fact that Popen is called when runas is used to get the runas user's environment. Since this test doesn't care about the output, we can just make the mocked Popen.communicate() return an empty bytestring.	2018-03-20 22:09:18 -05:00
rallytime	0f728186aa	Fix pillar unit test failures: file_roots and pillar_roots environments should be lists	2018-03-20 17:49:58 -04:00
rallytime	46ba72fb1c	Fix pillar unit test failures: file_roots and pillar_roots environments should be lists	2018-03-20 17:32:21 -04:00
Nicole Thomas	83ed40c06a	Merge pull request #46619 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.5 to 2017.7	2018-03-20 15:03:29 -04:00
Nicole Thomas	f038e3c452	Merge pull request #46571 from garethgreenaway/46552_onfail_and_require ... [2017.7] fixes to state.py	2018-03-20 09:40:03 -04:00
Nicole Thomas	7bc3c2e588	Merge pull request #46531 from terminalmage/issue44299 ... Fix regression in yumpkg._parse_repo_file()	2018-03-20 09:34:58 -04:00
rallytime	b03cda3cea	Merge branch '2018.3.0rc1' into '2018.3' ... No conflicts.	2018-03-20 09:13:13 -04:00
rallytime	bcbddf5d07	Merge branch '2017.7.5' into '2017.7' ... No conflicts.	2018-03-20 09:10:38 -04:00
Nicole Thomas	e1ade5dbb2	Merge pull request #46597 from terminalmage/fix-divergent-mongodb-states ... Revert PR 41278	2018-03-19 22:02:37 -04:00
Nicole Thomas	b361bc93e8	Merge pull request #46608 from garethgreenaway/46593_schedule_present_always_triggers_change ... [2018.3.0rc1] fixes to scheduler	2018-03-19 22:01:50 -04:00
Nicole Thomas	36a64ab2d8	Lint: Remove extra blank line	2018-03-19 17:03:25 -04:00
Erik Johnson	db304c3eff	Update tests to reflect changes to state returns	2018-03-19 15:18:49 -05:00
Gareth J. Greenaway	da9a9b6e37	Fixing a bug that would result in constant changes using the schedule state module when a job was added with run_on_start. Adding an eval test to test run_on_start functionality.	2018-03-19 09:23:22 -07:00