94106 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	71d4465b6c	Work around cmd.run unicode issues in test for now ... Cat is missing on windows. I tired unsuccesfully to make this work with the 'type' command on windows. This is maybe not ideal but it stablizes the test suite for now.	2018-08-23 16:21:20 -07:00
Nicole Thomas	158c1ca575	Merge pull request #49276 from terminalmage/fix-moved-funcs ... Fix paths to moved functions	2018-08-23 12:38:54 -04:00
Mike Place	ef39f85fac	Merge pull request #49270 from dwoz/test_event_fix ... Add async helper to test_sock_path_len	2018-08-23 10:17:54 -06:00
Daniel Wallace	5da743adff	Merge pull request #49199 from jacobweinstock/fix-typeerror-unicode ... Fix typeerror unicode	2018-08-23 09:38:16 -05:00
Nicole Thomas	e28f8f1ae0	Merge pull request #49264 from gtmanfred/diskusage ... fix diskusage beacon	2018-08-23 10:36:06 -04:00
Daniel Wallace	f6b2b93afe	Merge pull request #49253 from gtmanfred/vmware ... skip ID 7 for vmware hard drives	2018-08-23 09:35:30 -05:00
Erik Johnson	322a988def	Fix paths to moved functions	2018-08-23 08:32:11 -05:00
Erik Johnson	2a2bd48d83	Merge pull request #49263 from terminalmage/issue49159 ... Revert default value for ipv6 to None	2018-08-23 08:02:12 -05:00
Daniel A. Wozniak	51bf79afd9	Add async helper to test_sock_path_len ... This test function is causing another test: unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription To fail with 'Async operation timed out after 5 seconds', Adding the tornado Async test helper so that both tests pass.	2018-08-22 14:49:34 -07:00
Daniel Wozniak	ec32428f9b	Merge pull request #49244 from dwoz/gitfs_fixes ... Test fixes: unit.fileserver.test_gitfs	2018-08-22 13:19:41 -07:00
Daniel Wallace	2d7f8460bc	Merge pull request #49265 from terminalmage/fix-failing-file-tests ... Fix failing unit file module unit tests	2018-08-22 14:35:07 -05:00
Erik Johnson	6b51f71e40	Fix failing unit file module unit tests ... This just looks to have been incorrectly handled in a merge-forward.	2018-08-22 14:22:44 -05:00
Daniel Wallace	15857c2c54	fix diskusage	2018-08-22 14:00:26 -05:00
Erik Johnson	bf5d907ce4	Revert default value for ipv6 to None	2018-08-22 13:29:31 -05:00
Jacob Weinstock	25608ef119	Merge branch '2018.3' into fix-typeerror-unicode	2018-08-22 12:24:31 -06:00
Jacob Weinstock	11ad11c53a	add unicode_literals back to handle logging and other things.	2018-08-22 12:22:08 -06:00
Daniel Wozniak	4634752b7e	Merge pull request #49240 from dwoz/state_tests ... file state test fixes	2018-08-22 11:16:41 -07:00
Daniel A. Wozniak	b533fa179a	Simplify by using to_unicode helper	2018-08-22 10:01:39 -07:00
Mike Place	55ded9f03d	Merge pull request #49260 from gtmanfred/flaky-2018.3 ... [2018.3] flaky tests	2018-08-22 10:40:38 -06:00
Daniel Wallace	41973ff6c0	flaky tests are flaky yo	2018-08-22 11:38:48 -05:00
Daniel Wallace	c927f1bc2b	mark orchestration state tests as flaky	2018-08-22 11:38:40 -05:00
Daniel Wallace	6e776cae94	skip ID 7 for vmware hard drives	2018-08-22 10:25:44 -05:00
Mike Place	6d023cab6e	Merge pull request #49245 from dwoz/skip_grep_windows ... Skip grep unit tests on windows	2018-08-22 09:18:07 -06:00
Mike Place	75beedeb24	Merge pull request #49243 from dwoz/fileserver_tests ... Revert newline translation change	2018-08-22 09:12:25 -06:00
Daniel A. Wozniak	5a0cda51ed	Older GitPython version do not have a close method	2018-08-22 03:27:48 -07:00
Daniel A. Wozniak	e30589194e	Skip grep unit tests on windows ... These tests are specific to unix like platforms that have grep installed. On windows we use the win_file module.	2018-08-22 00:08:12 -07:00
Daniel A. Wozniak	74527158ec	Fix up fileserver.test_gitfs tests on windows	2018-08-21 23:45:59 -07:00
Daniel A. Wozniak	800aa254c6	Remove unicode filenames on windows python 2 ... Need to provide unicode to shutil in order to retrieve and delete unicode.	2018-08-21 23:45:56 -07:00
Daniel A. Wozniak	1679a19732	Work around listdir encoding issues on py2 windows	2018-08-21 21:53:12 -07:00
Daniel A. Wozniak	86e3c46959	Revert newline translation change ... On windows, newlines will be CRLF since we added unix2dos to kitchen.	2018-08-21 20:43:41 -07:00
Daniel A. Wozniak	07ed84197d	file state test fixes ... - fix integration.states.test_file.FileTest.test_managed_latin1_diff - fix integration.states.test_file.FileTest.test_recurse_issue_40578 - fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls, this test still fails due to py2 popen's unicode handling.	2018-08-21 14:10:41 -07:00
Mike Place	60605f0248	Merge pull request #48545 from bbinet/fix-unreacheable-ssh-id-wrapper ... Fix unreachable ssh-id-wrapper template when root_dir is relative	2018-08-21 09:12:00 -06:00
Bruno Binet	284dcf7c03	Fix unreachable ssh-id-wrapper template when root_dir is relative ... Since the git commands will be executed from the user home directory, if salt root_dir is set to a relative path (for example using `root_dir: ./.tmp/` in salt config), then the git/ssh-id-wrapper template may be unreachable and we may encouter the following error that this patch is fixing: ``` [ERROR ] Command '[u'git', u'ls-remote', u'git@github.com:bbinet/salt-formula-linux.git']' failed with return code: 128 [ERROR ] stderr: error: cannot run .tmp/thin/py2/salt/templates/git/ssh-id-wrapper: No such file or directory fatal: unable to fork [ERROR ] retcode: 128 [ERROR ] Failed to check remote refs: Unable to authenticate using identity file: error: cannot run .tmp/thin/py2/salt/templates/git/ssh-id-wrapper: No such file or directory fatal: unable to fork ```	2018-08-21 09:28:49 +02:00
Jacob Weinstock	6944bafb45	add salt.utils.stringutils.to_bytes. add comment on unicode_literals.	2018-08-20 18:33:16 -06:00
Daniel Wallace	a4c51a9e18	Merge pull request #49209 from gtmanfred/lsattr ... don't blow up check_perms if lsattr file doesn't exist	2018-08-20 14:02:42 -05:00
Daniel Wallace	d29af008da	Merge pull request #49190 from The-Loeki/redis-fix ... decode_reponses=True on all Redis API interfaces	2018-08-20 13:57:25 -05:00
Daniel Wallace	644ba3d34c	Merge pull request #49197 from dwoz/test_fix ... File state line ending fixes	2018-08-20 13:45:03 -05:00
Daniel Wallace	ab918ca6b0	don't blow up check_perms if lsattr file doesn't exist	2018-08-20 09:13:36 -05:00
Daniel A. Wozniak	a7cfe355d7	File state line ending fixes	2018-08-19 13:09:23 -07:00
Ronald van Zantvoort	d12631884c	Merge branch '2018.3' into redis-fix	2018-08-19 13:07:45 +02:00
Daniel Wozniak	aaa9e37215	Merge pull request #49192 from dwoz/git_test_fix_ng ... Test fixes flaky test and unicode environment key/value	2018-08-19 03:48:02 -07:00
Daniel Wozniak	63cc737af1	Merge pull request #49191 from The-Loeki/vault_publ_conn ... Make salt.utils.vault._get_connection publicly available	2018-08-19 03:39:34 -07:00
Daniel A. Wozniak	8ea89e943f	Test fixes ... - Fix tearDown method to remove unicode environment key. - Mark flaky test as such, test_set_system_time fails when run at certian times of the day.	2018-08-18 20:59:36 -07:00
Ronald van Zantvoort	7ff72eb01f	redis cache no utf8 of course	2018-08-19 02:00:50 +02:00
Ronald van Zantvoort	cab41921c3	publicize salt.utils.get_vault_connection()	2018-08-19 00:22:37 +02:00
Ronald van Zantvoort	bdaef3907a	decode_reponses=True on all Redis API interfaces	2018-08-19 00:11:20 +02:00
Daniel Wozniak	1d843d4526	Merge pull request #49189 from dwoz/cmd_test_fix ... Merge pull request #49171 from Ch3LL/bp-49103	2018-08-18 13:51:58 -07:00
Daniel Wozniak	8fd0c38f49	Merge pull request #49171 from Ch3LL/bp-49103 ... [2018.3.3] cherry pick #49103	2018-08-18 10:56:54 -07:00
Daniel Wozniak	5f905d7260	Merge pull request #49188 from cachedout/fix_test_pkg ... Fix bug in test_pkg	2018-08-18 10:36:22 -07:00
Mike Place	6fb8d4a33f	Merge pull request #49056 from Ch3LL/test_mine ... Add orch runner with mine.get integration tests	2018-08-18 08:54:47 -04:00