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
Pedro Algarvio
af4f2043bf
Merge pull request #52645 from dwoz/test_fixes
...
Fix salt.modules.publish and salt.states.x509 tests
2019-04-20 09:17:17 +01:00
Daniel A. Wozniak
9b6f9f94d0
Clean up cruft
2019-04-20 03:57:36 +00:00
Daniel A. Wozniak
c3971a5802
Fix salt.modules.publish and salt.states.x509 tests
...
The peers.conf addition for the x509 state tests broke the
salt.modules.publish tests. Move the configuration to the test master's
config. Also increase the publish call timeout in the x509 module to
make the x509 state tests reliable on all platforms.
2019-04-20 03:16:46 +00:00
Megan Wilhite
ecd6802b3f
Merge branch '2019.2.1' into cp-52415
2019-04-19 16:01:12 -04:00
Ch3LL
538d5cf1c3
Remove pchanges from win_dacl
2019-04-19 16:00:39 -04:00
tanlingyun2005
65ee219318
Merge branch '2019.2.1' of https://github.com/tanlingyun2005/salt into 2019.2.1
2019-04-20 03:32:37 +08:00
tanlingyun2005
509c79728c
bug fix salt/cli/batch.py
2019-04-20 03:30:44 +08:00
tanlingyun2005
f71168d2e7
Merge branch '2019.2.1' into 2019.2.1
2019-04-20 03:11:58 +08:00
Megan Wilhite
0a4d2d9c33
Merge pull request #52629 from dwoz/ping_wait_2019.2.1
...
Fix event assertion race condition
2019-04-19 15:03:19 -04:00
tanlingyun2005
211915ca90
fix salt/cli/batch.py TypeError: argument of type int is not iterable
2019-04-20 02:52:50 +08:00
Daniel A. Wozniak
c001022913
Fix linter
2019-04-19 16:22:52 +00:00
Daniel A. Wozniak
423f6f96b7
Fix vent assertion race condition
2019-04-19 16:16:01 +00:00
tanlingyun2005
070ae845de
fix TypeError: argument of type int is not iterable
2019-04-19 16:37:11 +08:00
Daniel Wozniak
4859e6c9f0
Merge pull request #52619 from dwoz/pytest_engine_2019.2.1
...
Remove unused method from pytest engine
2019-04-18 16:45:34 -07:00
Daniel A. Wozniak
105784a0da
Remove unused method from pytest engine
2019-04-18 22:48:34 +00:00
Daniel Wozniak
77943e5f38
Merge pull request #52614 from Ch3LL/cp-test_network-2019.2.1
...
[2019.2.1] Update integration.modules.test_network.NetworkTest.test_network_ping…
2019-04-18 14:54:28 -07:00
Daniel Wozniak
c6b49861b3
Merge pull request #52615 from twangboy/gitfs_2019.2.1
...
Bring 51661 into 2019.2.1
2019-04-18 14:53:34 -07:00
Shane Lee
d95267493c
Merge branch '2019.2.1' into gitfs_2019.2.1
2019-04-18 15:04:12 -06:00
twangboy
5a0464bdef
Bring 51661 into 2019.2.1
2019-04-18 14:15:44 -06:00
Daniel Wozniak
8ee15a982f
Merge pull request #52548 from cbosdo/virt-purge-fix
...
Virt purge fix
2019-04-18 13:07:35 -07:00
Pedro Algarvio
27c79d2a21
Update integration.modules.test_network.NetworkTest.test_network_ping test address
2019-04-18 15:44:36 -04:00
Daniel Wozniak
e03aed58e8
Merge pull request #52591 from Ch3LL/fix_jsonschema_2019.2
...
[2019.2.1] Update test_schema to mirror the new ValidationErrors in 3.0.0
2019-04-18 09:34:21 -07:00
Ch3LL
81b865f667
use same newfile message on linux for windows file state
2019-04-18 11:08:59 -04:00
