Commit Graph

66728 Commits

Author SHA1 Message Date
rallytime
58c844a7d7 Add mac_desktop integration tests
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
2016-03-24 17:02:53 -06:00
Mike Place
6b5c65eafa Merge pull request #32093 from twangboy/mac_softwareupdate_int
Use class attributes in mac_softwareupdate tests
2016-03-24 15:55:24 -06:00
Mike Place
1545b80017 Merge pull request #32034 from twangboy/mac_pkgutil_int
Integration tests for mac_pkgutil
2016-03-24 15:44:51 -06:00
Mike Place
59fde81457 Merge pull request #32094 from twangboy/mac_power_int
Use class attributes in mac_power tests
2016-03-24 15:33:30 -06:00
Mike Place
31da3776a1 Merge pull request #32111 from thatch45/ssh_fix
fix for no grains in salt-ssh
2016-03-24 15:21:01 -06:00
Thomas S Hatch
66475c3138 CAN HAZ 2016-03-24 14:04:55 -06:00
Nicole Thomas
cb8d940915 Merge pull request #32124 from jtand/re-enable_skipped_boto_tests
Re-enable some skipped Boto tests
2016-03-24 11:25:33 -06:00
Thomas S Hatch
81d267bcfd try to change the test run to always clean the thindir 2016-03-24 10:40:23 -06:00
Thomas S Hatch
d023b0b48d revert 2016-03-24 10:32:45 -06:00
Justin Anderson
f8080b8e59 Re-enable some skipped Boto tests 2016-03-24 10:30:48 -06:00
Thomas S Hatch
ed0a997880 try it without passing in the context into the pack 2016-03-24 10:10:01 -06:00
Thomas S Hatch
357a66471d fix for no grains in salt-ssh 2016-03-23 17:44:18 -06:00
Nicole Thomas
58ce7536b6 Merge pull request #32103 from cro/adext
WIP, please merge to fix test failures
2016-03-23 15:45:27 -06:00
twangboy
d1505bc892 Use class attributes instead of global variables 2016-03-23 15:03:04 -06:00
twangboy
fa59c50ba9 Change from global to class attributes 2016-03-23 14:52:48 -06:00
C. R. Oldham
f5bd3463aa Replace original auth_check fn. 2016-03-23 14:45:31 -06:00
C. R. Oldham
9d1ad2082c Add comments for expanded auth checks. 2016-03-23 14:33:04 -06:00
C. R. Oldham
c57a232809 Catch traceback when LDAP returns something other than the nested tuple 2016-03-23 14:29:47 -06:00
C. R. Oldham
4af4280d04 Fix issue causing automated tests to fail. 2016-03-23 14:29:47 -06:00
twangboy
a5fd2dd29b Add global variables to setUp 2016-03-23 12:16:12 -06:00
twangboy
9dcaba7e67 Add global variables to setUp 2016-03-23 12:10:05 -06:00
Mike Place
eb139ab935 Merge pull request #32089 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-23 11:56:58 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 10:56:25 -06:00
Mike Place
bc9a899bc8 Merge pull request #32074 from Xiami2012/fix_iptables
Fix code for proto args in modules.iptables
2016-03-23 10:37:58 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests
Mac assistive tests
2016-03-23 09:51:36 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl
Bring back localectl parsing in locale module for when dbus module is unavailable
2016-03-23 09:47:27 -06:00
Nicole Thomas
11f2ba829d Merge pull request #32071 from jtand/skip_client_test_if_not_zmq
Skipped test if zeromq is not transport
2016-03-23 09:15:32 -06:00
Xiami
aae3af7e49 Fix code for proto args in modules.iptables
In modules.iptables.build_rule:
  Fix incorrect output when providing proto='!tcp'
  Make salt cleverer when both 'protocol' and 'proto' in kwargs.

NOTE: Conflicts in merge commit 000de95 are wrong dealed with.
2016-03-23 18:19:18 +08:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -06:00
Nicole Thomas
1af2e41a17 Merge pull request #32063 from rallytime/bp-31995
Back-port #31995 to 2016.3
2016-03-22 15:59:43 -06:00
Nicole Thomas
0ea909b617 Merge pull request #32064 from rallytime/bp-31961
Back-port #31961 to 2016.3
2016-03-22 15:44:42 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Gary Richmond
d2949ff2f5 Alphabetized region list; corrected curly quote 2016-03-22 14:36:28 -06:00
Gary Richmond
9fffb5d1e9 Add support for ap-northeast-2 and us-gov-west-1 regions in AWS 2016-03-22 14:36:28 -06:00
Nicole Thomas
3e08dd0a93 Merge pull request #32053 from basepi/fix_rabbitmq
[2015.8] Fix rabbitmq_user.present tag handling
2016-03-22 14:33:51 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
2016-03-22 14:11:40 -06:00
twangboy
158ebc76b8 Fix unit tests for mac_utils 2016-03-22 13:46:19 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Colton Myers
bed048e1e7 Remove leftover arg (lint) 2016-03-22 11:50:38 -06:00
Colton Myers
08868cb32a Fix tag handling code for rabbitmq_user.present 2016-03-22 11:16:17 -06:00
Mike Place
5a20dae07b Merge pull request #32036 from jfindlay/mac_service_revert
mac_service: use load/unload for service operations
2016-03-22 11:14:02 -06:00
Colton Myers
3b6d25b4e9 Remove leading whitespace on tags
Was converting '[admin, monitoring]' to ['admin', ' monitoring']

Now converts to ['admin', 'monitoring']
2016-03-22 11:03:57 -06:00
Nicole Thomas
7ddecc755c Merge pull request #32047 from jtand/lint_fixes
Removed some unused imports for lint fixes
2016-03-22 09:47:50 -06:00
Nicole Thomas
468c0c6fb1 Merge pull request #32035 from tonybaloney/2016.3
Document what is in the Dimension Data Cloud support in SaltStack 2016.3
2016-03-22 09:16:50 -06:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Justin Findlay
2534dce5c7 modules.mac_service: use old style launchctl cmds 2016-03-21 21:08:51 -06:00
Justin Findlay
31a47c0957 modules.mac_service: run launchctl through single fcn 2016-03-21 21:08:51 -06:00
Justin Findlay
9b4ecccc7a modules.mac_service: match status to linux service.status 2016-03-21 21:08:51 -06:00
Justin Findlay
44c64f20ca modules.mac_service: no spam debug log with service guts 2016-03-21 21:08:51 -06:00