valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,932 Commits 24 Branches 182 Tags 341 MiB
a333210a08
Commit Graph

6836 Commits

Author SHA1 Message Date
rallytime
a333210a08 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 16:10:31 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -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
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
37c410fee4 Merge pull request #32079 from rallytime/merge-32041 
Merge #32041 with test removal
 2016-03-23 09:42:35 -06:00
rallytime
b13fdc1831 Remove useless tests 2016-03-23 08:49:52 -06:00
Stefan Schweer
1ee6e7b04f replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
 2016-03-23 11:55:27 +01:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -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
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix 
Make sure there are no connection object cache hits on boto_* unit te…
 2016-03-22 14:38:46 -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
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Stefan Schweer
d317f7134f replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
 2016-03-22 18:01:57 +01:00
Stefan Schweer
bac08b24ec replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
 2016-03-22 18:00:33 +01:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Kris Raney
b4889024c5 Merge branch 'develop' into kraney_bugfix 2016-03-22 09:05:58 -05:00
Nicole Thomas
750e970d57 Merge pull request #32028 from rallytime/merge-31884 
Merge #31884 with pylint fixes
 2016-03-21 15:19:57 -06:00
rallytime
92ea2709d7 More pylint fixes 2016-03-21 14:55:03 -06:00
Mike Place
0a1753b83d Merge pull request #31885 from Ch3LL/add_mac_brew_tests 
renamed brew.py to mac_brew.py and added tests
 2016-03-21 14:22:47 -06:00
Mike Place
a496806fa2 Merge pull request #32000 from twangboy/mac_power_int 
Integration tests for mac_power.py
 2016-03-21 14:18:57 -06:00
rallytime
3e61603d5b Pylint fix for #31884 
Merges #31884
 2016-03-21 14:18:29 -06:00
Ch3LL
aa519814f2 reverse the format indices 2016-03-21 14:17:27 -06:00
Ch3LL
3f2b851203 add more tests for mac_group 2016-03-21 14:17:27 -06:00
Nicole Thomas
d85dfbea50 Merge pull request #32001 from alprs/fix-alternatives_state_integration_tests 
Add integration test for alternatives state
 2016-03-21 13:40:45 -06:00
Andreas Lutro
195fd53713 Add a basic integration test for locale module 2016-03-21 20:22:16 +01:00
Andreas Lutro
a31cdf1968 Fix and improve locale module for systemd 
- parse localectl output when dbus module is unavailable
- use dbus/localectl whenever the system is detected to have been booted
  with systemd as the init system, regardless of os grain
- simplify and improve logic when parsing dbus/localectl
  - don't rely on exceptions to find the end of the locale params
  - make sure that all locale params get returned
 2016-03-21 20:22:16 +01:00
twangboy
100bcefa60 Fix unit tests 2016-03-21 12:15:08 -06:00
Mike Place
a940c64981 Merge pull request #31994 from twangboy/mac_softwareupdate_int 
Integration tests for mac_softwareupdate.py
 2016-03-21 12:01:14 -06:00
Andreas Lutro
e9fe661e72 add integration test for alternatives state 
the alternatives state module has been through some contradictory
changes recently. an integration test should help validate that it
actually works.
 2016-03-21 17:53:01 +01:00
Dmitry Kuzmenko
88e8106b00 Handle -c option in minionswarm script. 
There is a '-c' option that says: pass in an alt. conf. dir.
But this option isn't used in the minionswarm. I found it very useful to
use it to specify a path to the base salt configuration that would be
updated with the minionswarm specific needs (different ports, paths
etc.) keeping other parameters like alive intervals, timeouts, mine
options and so on.
 2016-03-21 16:13:43 +03:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01:00
twangboy
3d7ff12019 Fix line lengths 2016-03-18 17:59:07 -06:00
twangboy
787835a13a Fix tests for sleep functions 2016-03-18 17:57:02 -06:00
twangboy
a15aaff241 Add remaining integration tests 2016-03-18 17:36:49 -06:00
twangboy
2517abafca Integration tests for sleep functions 2016-03-18 17:11:35 -06:00
rallytime
37dee42061 Pylint fixes 2016-03-18 16:27:06 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
twangboy
ed1fbecfea Integration test framework 2016-03-18 15:55:57 -06:00
twangboy
894151b334 Fix test_schedule test 2016-03-18 14:53:26 -06:00
twangboy
0099ccb256 Finished integration tests 2016-03-18 14:42:03 -06:00
twangboy
0bf1672daf Fix set_catalog function 2016-03-18 14:40:03 -06:00
twangboy
fcf0ce2c7b Fix get_catalog 2016-03-18 14:29:21 -06:00
twangboy
73f51a39ed Add checks to download 2016-03-18 14:22:15 -06:00
twangboy
182b80d67e Refactor update 2016-03-18 14:12:31 -06:00
rallytime
4768bfafc6 Disable boto tests that are failing on develop 2016-03-18 14:02:06 -06:00
twangboy
12668fe447 Fix integration tests 
Code refactoring
Put cmd in lists
 2016-03-18 13:53:40 -06:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00