Daniel Wozniak
1ce7d6c38a
Merge pull request #47989 from dwoz/awscloud
...
Properly decode password from aws using m2crypto
2018-06-06 13:44:28 -07:00
Daniel A. Wozniak
23ab2727be
Fix linter errors
2018-06-06 09:43:04 -07:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client
...
Fix `unit.modules.test_win_dns_client` tests
2018-06-06 11:02:10 -04:00
Daniel A. Wozniak
6c8daa2b85
Properly decode password from aws using m2crypto
...
Fixes issue #47955
2018-06-05 22:27:36 -07:00
twangboy
4ce551811f
Remove the unnecessary to_unicode stuff
2018-06-05 17:49:22 -06:00
twangboy
863ded39fa
Mock reg.cast_vdata
2018-06-05 15:38:28 -06:00
twangboy
2dcdf6788c
Force string to ModuleType
2018-06-05 15:27:12 -06:00
Gareth J. Greenaway
e22df8473d
Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback.
2018-06-04 16:00:54 -07:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-06-04 14:55:11 -04:00
L4rS6
6d7ef27557
Merge branch '2018.3' into fix-broken-rabbitmq-list-policies
2018-06-04 10:59:30 +02:00
Lars Wagner
e043ea2833
refactored list_policies code and added more tests
2018-06-04 10:56:12 +02:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
2018-06-01 14:54:12 -04:00
Erik Johnson
8cb33d3dec
Quiet the linter
...
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module
2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking
...
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes
2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
...
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559
2018-05-31 11:28:30 -04:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-30 17:20:37 -04:00
rallytime
e5d386e91c
Update solaris core grains test
...
The check for zpool grains was moved out of core grains and into
zfs grains. The mock for the call to zpool grains function was failing.
We also need to update any calls to the salt.utils file to use the new
paths.
2018-05-30 13:50:22 -04:00
rallytime
267f09c1a0
Lint: Remove unused import
2018-05-29 13:56:15 -04:00
rallytime
120ee16b70
Replace old utils paths with new utils paths
2018-05-29 11:19:34 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/win_snmp.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_pkg.py
- tests/support/helpers.py
- tests/support/runtests.py
- tests/unit/fileserver/test_gitfs.py
- tests/whitelist.txt
2018-05-29 11:14:39 -04:00
Travis Paul
d50c0ab96b
Lint test_pkgin.py
2018-05-29 10:10:43 -04:00
Travis Paul
4dac0b4a31
pkgin latest_version bugfix
...
Handle case where the currently installed package is the latest
2018-05-29 10:10:43 -04:00
Travis Paul
4ae0313797
Bugfixes and unit tests for pkgin module
...
Corrects pkg.lastest_version and pkg.file_dict behavior
2018-05-29 10:10:43 -04:00
Nicole Thomas
30b31c5db5
Merge pull request #47800 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-25 21:17:40 -04:00
Nicole Thomas
799fce979d
Merge pull request #47552 from twangboy/fix_46981
...
Show GPO settings, raise error if trying to set gpo managed settings
2018-05-25 16:41:21 -04:00
Nicole Thomas
da9eaa1825
Merge pull request #47581 from twangboy/fix_47274
...
Add get_encoding salt util
2018-05-25 16:40:06 -04:00
Nicole Thomas
b860d95b2c
Merge pull request #47726 from gtmanfred/2018.3
...
rename boto to botomod
2018-05-25 16:37:36 -04:00
twangboy
60499d18f0
Skip test if pytz not present
2018-05-25 11:53:37 -06:00
Nicole Thomas
6889befc6b
Merge branch '2017.7' into solaris_product_grains
2018-05-25 09:57:40 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981
2018-05-24 12:52:59 -04:00
Nicole Thomas
ff6600f25e
Merge branch '2018.3' into fix_47274
2018-05-24 12:47:29 -04:00
Nicole Thomas
0ca5224cbf
Merge branch '2017.7' into winuser
2018-05-24 12:08:35 -04:00
Daniel A. Wozniak
e5948902af
Use salt utils method for this_user
2018-05-24 00:40:20 -07:00
twangboy
9923176b68
Use __utils__, fix unit tests
2018-05-23 17:27:58 -06:00
Daniel A. Wozniak
a056a293f1
Centeralize test username lookup
2018-05-23 16:16:35 -07:00
twangboy
6eff2f847b
Add suggested changes
2018-05-23 13:34:33 -06:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- requirements/dev_python27.txt
- requirements/dev_python34.txt
- salt/fileclient.py
- salt/output/__init__.py
- salt/serializers/configparser.py
- salt/states/pkg.py
- salt/states/zpool.py
- salt/transport/tcp.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_mac_user.py
- tests/integration/modules/test_pip.py
- tests/integration/modules/test_pkg.py
- tests/integration/modules/test_service.py
- tests/integration/states/test_pip_state.py
- tests/integration/states/test_user.py
- tests/unit/modules/test_cmdmod.py
2018-05-23 12:33:00 -04:00
Nicole Thomas
1efe891c42
Merge pull request #47776 from garethgreenaway/970_two_minion_unit_tests_failing
...
[2018.3] Fixes to failing _before_connect tests
2018-05-23 11:10:34 -04:00
Nicole Thomas
4a6ca67883
Merge pull request #47783 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2018.3.1 to 2018.3
2018-05-23 10:51:55 -04:00
Gareth J. Greenaway
a5011b49ab
Merge branch '2018.3' into 970_two_minion_unit_tests_failing
2018-05-22 14:41:10 -07:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3'
...
No conflicts.
2018-05-22 17:14:31 -04:00
Gareth J. Greenaway
ef24f72169
Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect.
2018-05-22 12:12:49 -07:00
Daniel Wallace
43997a466e
fix tests
2018-05-22 12:49:47 -05:00
Daniel Wallace
7e30f459c9
rename boto to botomod
2018-05-22 12:49:47 -05:00
Nicole Thomas
60ec3230db
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields
2018-05-22 11:35:20 -04:00
rallytime
17596f3025
Merge branch '2017.7.6' into '2017.7'
...
No conflicts.
2018-05-22 11:26:44 -04:00
Daniel Wallace
3cfb95c7bc
skip test that breaks test suite
2018-05-22 09:34:53 -04:00
