valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,745 Commits 24 Branches 182 Tags 341 MiB
76b843cf9e
Commit Graph

66745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
76b843cf9e Merge pull request #32136 from jtand/arch_alternatives 
Arch does not have the alternatives directory
 2016-03-25 09:24:56 -06:00
Nicole Thomas
37f2a98dc9 Merge pull request #32140 from rallytime/bp-32110 
Back-port #32110 to 2016.3
 2016-03-25 09:22:30 -06:00
Mike Place
377c102470 Merge pull request #31790 from twangboy/mac_system_int 
Integration tests for mac_system
 2016-03-24 17:11:29 -06:00
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
Justin Anderson
a0d1f42337 Lint fix 2016-03-24 16:33:18 -06:00
Justin Anderson
291a5695d3 Arch does not have the alternatives directory 2016-03-24 16:12:01 -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
3eefd8ccad Use class attributes instead of global variables 2016-03-23 15:37:59 -06:00
twangboy
79963c9020 Add global variables to setUp 2016-03-23 15:37:59 -06:00
twangboy
4828f315ec Fix a pylint error 2016-03-23 15:37:59 -06:00
twangboy
4266a95411 Remove redundant try/except blocks 2016-03-23 15:37:59 -06:00
twangboy
e306bc40de Fix pylint error... maybe 2016-03-23 15:37:59 -06:00
twangboy
357911cc8f Fix decorator 2016-03-23 15:37:59 -06:00
twangboy
6ae27945fd Add disabled decorator 2016-03-23 15:37:59 -06:00
twangboy
b04229430c Improve integration tests 2016-03-23 15:37:59 -06:00
twangboy
df19c478a9 Add exception handling 2016-03-23 15:37:59 -06:00
twangboy
a0943c136f Fix some pylint errors 2016-03-23 15:37:59 -06:00
twangboy
d45def946a Finish integration tests for mac_system 
Fixes service.start and service.stop
Fixes system.get_boot_arch
Adds 'yes' and 'no' to validate_enabled function in mac_utils
 2016-03-23 15:37:59 -06:00
twangboy
9bb49659b5 Explicitely call salt mac_utils functions 2016-03-23 15:30:56 -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