Pedro Algarvio
a944017d1d
libcrypto.OpenSSL_version_num might be a callable
2019-05-06 07:50:57 +01:00
Daniel Wozniak
b625a6a0b6
Merge pull request #52839 from twangboy/fix_test_grain
...
Add support for EC2
2019-05-04 10:28:53 -07:00
twangboy
1c9b372405
Add support for EC2
2019-05-03 22:44:55 -06:00
Daniel Wozniak
60029398c6
Merge pull request #52767 from Ch3LL/zmq_filter_test
...
[2019.2.1] Add tests to PR #51983
2019-05-03 01:35:27 -07:00
Daniel Wozniak
59969323c1
Merge pull request #52827 from twangboy/add_pymssql
...
Add pymssql dependency for Windows builds
2019-05-03 01:21:39 -07:00
Daniel Wozniak
e3918c59f7
Merge pull request #52797 from garethgreenaway/52717_debian_tests_segmentation_fault
...
[2019.2.1] Only run the libcrypto init if less than OpenSSL 1.1.0
2019-05-02 22:12:30 -07:00
twangboy
6f0b8e25ae
Add pymssql dependency for Windows builds
2019-05-02 16:59:27 -06:00
Gareth J. Greenaway
7ab096167c
Merge branch '52717_debian_tests_segmentation_fault' of github.com:garethgreenaway/salt into 52717_debian_tests_segmentation_fault
2019-05-02 13:36:09 -07:00
Gareth J. Greenaway
6ffbca52f3
Fixing lint.
2019-05-02 13:34:06 -07:00
Gareth J. Greenaway
f8d816e4b0
Merge branch '2019.2.1' into 52717_debian_tests_segmentation_fault
2019-05-02 08:24:22 -07:00
Gareth J. Greenaway
e24f2f8f21
Only run the libcrypto init if less than OpenSSL 1.1.0.
2019-05-02 08:03:57 -07:00
Megan Wilhite
1ee8f37c77
Merge branch '2019.2.1' into zmq_filter_test
2019-05-02 10:35:53 -04:00
Pedro Algarvio
b68544ffbc
Merge pull request #52771 from twangboy/fix_test_gpg
...
Fix `test_gpg` tests on Windows
2019-05-02 14:30:17 +01:00
Pedro Algarvio
316d05b6e9
Merge pull request #52783 from Ch3LL/fix_boto_yaml
...
Fix boto_apigateway tests for PyYAML 5.1
2019-05-02 14:26:33 +01:00
Ch3LL
cde29cb334
Fix boto_apigateway tests for PyYAML 5.1
2019-05-01 15:40:58 -04:00
Megan Wilhite
d74b6ee7b9
Merge branch '2019.2.1' into zmq_filter_test
2019-05-01 10:33:44 -04:00
twangboy
c7f45c241a
Pass encoding to stringutils.to_unicode
2019-04-30 16:29:03 -06:00
Daniel Wozniak
35094653c9
Merge pull request #52769 from twangboy/fix_test_core
...
Remove domain grain from tests for Windows
2019-04-30 14:14:25 -07:00
Daniel Wozniak
30dc14bab1
Merge pull request #52768 from twangboy/fix_test_win_dacl
...
Remove pchanges... again...
2019-04-30 13:24:26 -07:00
Daniel Wozniak
32102749da
Fix linter warnings
2019-04-30 13:23:45 -07:00
twangboy
0049f85fbe
Remove domain grain from tests
2019-04-30 14:01:24 -06:00
twangboy
123b6075fe
Remove pchanges... again...
2019-04-30 13:53:43 -06:00
Ch3LL
e7c9d6ea22
increase timeout when gathering results
2019-04-30 15:53:39 -04:00
Ch3LL
784786d004
Add zmq_filter unit tests
2019-04-30 15:48:53 -04:00
Loïc Yavercovski
805c5eeb08
encode topic before using hashlib
2019-04-30 15:48:00 -04:00
Daniel Wozniak
3e46f5143d
Merge pull request #52753 from twangboy/skip_test_gen_thin
...
Skip test_gen_thin_compression_fallback_py3
2019-04-29 20:36:26 -07:00
twangboy
811b381714
Skip test_gen_thin_compression_fallback_py3
...
Skips this test on Windows running Python 2
This test is causing python to hard crash, thus killing the entire test
suite
Also simplifies the _get_thintar_prefix function
2019-04-29 16:56:26 -06:00
Daniel Wozniak
6bfca941a9
Merge pull request #52736 from dwoz/ec2test
...
Skip password decryption test when no libraries available
2019-04-29 10:07:55 -07:00
Shane Lee
04ad027732
Merge branch '2019.2.1' into ec2test
2019-04-29 09:39:52 -06:00
Megan Wilhite
9a1ed78cca
Merge pull request #52624 from tanlingyun2005/2019.2.1
...
fix TypeError: argument of type int is not iterable
2019-04-29 09:15:41 -04:00
Daniel A. Wozniak
b770f965d3
Skip test requiring crypto when none available
2019-04-29 03:41:38 +00:00
Daniel A. Wozniak
e52b390d63
Warn when password decrypton requested but not possible
2019-04-29 03:41:25 +00:00
tanlingyun2005
2c6867e36f
add test case to tests/unit/cli/test_batch.py
2019-04-26 23:44:22 +08:00
tanlingyun2005
cb7742ec4f
Merge branch '2019.2.1' into 2019.2.1
2019-04-26 12:21:19 +08:00
Daniel Wozniak
806307aecf
Merge pull request #52696 from Ch3LL/bp-50087
...
Backport #50087 into 2019.2.1
2019-04-25 13:33:12 -07:00
rbthomp
66e97e70f3
Fix applying of attributes for returner rawfile_json
...
Arguments are not getting applied to the rawfile_json returner. For example if you specify an alternate filename for the output the default "/var/log/salt/events" is always used. Passing the `ret` to `_get_options(ret) resolve this.
2019-04-25 11:07:58 -04:00
tanlingyun2005
c943900ac0
Merge branch '2019.2.1' into 2019.2.1
2019-04-23 19:14:50 +08:00
dextertan
d4abddd3ed
fix TypeError: argument of type int is not iterable
2019-04-23 19:07:15 +08:00
Daniel Wozniak
174f558ba6
Merge pull request #52659 from twangboy/fix_test_win_file
...
Fix issues with the win_file tests
2019-04-22 16:34:35 -07:00
twangboy
915c780775
Fix issues with the win_file tests
...
Remove pchanges
Migrate to __utils__['dacl.check_perms']
2019-04-22 16:30:32 -06:00
tanlingyun2005
ed908b3e51
Merge branch '2019.2.1' into 2019.2.1
2019-04-22 10:07:27 +08:00
Daniel Wozniak
d1a61a647b
Merge pull request #52655 from dwoz/cron_test_fix
...
Parse chattr version and fix test case
2019-04-21 18:46:28 -07:00
Daniel A. Wozniak
e69fcc57de
Fix typo
2019-04-22 00:46:01 +00:00
Daniel A. Wozniak
859d088da8
Merge remote-tracking branch 'origin/cron_test_fix' into cron_test_fix
2019-04-22 00:11:37 +00:00
Daniel A. Wozniak
169c2d56aa
Chattr version py3 fix
2019-04-22 00:11:13 +00:00
Gareth J. Greenaway
7f7bb900dc
Merge branch '2019.2.1' into cron_test_fix
2019-04-21 15:44:27 -07:00
Daniel A. Wozniak
cf88c27353
Fix linter issues
2019-04-21 22:43:15 +00:00
Daniel A. Wozniak
0ea007de6f
Parse chattr version and fix test case
...
- Parse the system's chattr version from the chattr man page
- Fix integration.states.test_cron on centos 6
2019-04-21 22:19:45 +00:00
Daniel Wozniak
f7d823c8aa
Merge pull request #52601 from Ch3LL/cp-52415
...
Cherry-Pick #52415 into 2019.2.1
2019-04-21 12:33:03 -07:00
tanlingyun2005
463b60e817
Merge branch '2019.2.1' into 2019.2.1
2019-04-20 19:18:52 +08:00
