valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,280 Commits 24 Branches 182 Tags 341 MiB
9dc19caa79
Commit Graph

3019 Commits

Author SHA1 Message Date
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay 
Make system.reboot use `shutdown -r` when available
 2015-10-13 08:52:06 -06:00
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available 
see issue #27710
 2015-10-12 21:54:42 +02:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629 
Removed dependency on powershell to restart salt-minion
 2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96 Merge pull request #27550 from rallytime/cloud-logging 
[2015.8] Clean up salt-cloud logging and make it more useful
 2015-09-30 09:48:53 -06:00
Nicole Thomas
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-29 21:38:22 -06:00
rallytime
78c85fbb31 Add unit tests for new recursive function 2015-09-29 21:25:47 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support 
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
 2015-09-29 09:51:28 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
justinta89
fd0dedeb99 Skipping Async tests 
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
 2015-09-24 13:41:58 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00
Erik Johnson
30a4915762 Update tests to reflect changes to timezone module 2015-09-10 11:05:38 -05:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
Seth House
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-08 15:40:06 -06:00
Mike Place
a33569a8be Merge pull request #26910 from s0undt3ch/hotfix/26848-event-backwards-compat 
Sometimes the event system is just too fast
 2015-09-04 09:00:39 -06:00
Pedro Algarvio
503e050a75 Sometimes the event system is just too fast 2015-09-04 15:52:06 +01:00
Mike Place
1d5fd71fa3 Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat 
Restore backwards compatibility to `salt.utils.event`
 2015-09-03 17:04:45 -06:00
Michael Steed
d6e64ec1a7 lint 2015-09-03 14:30:58 -06:00
Michael Steed
a42651fb38 spm updates 
- add hash_file() routine to salt.spm.pkgfiles.local
- use os.path.exists() instead of pkgfiles.path.exists() in
  _local_install()
 2015-09-03 14:28:21 -06:00
Mike Place
57b78d369a Make the testing ioloop the current one 
Otherwise, loops from previous intefere and cause stacktraces on ioloop init
 2015-09-03 13:28:28 -06:00
Pedro Algarvio
2f40387290 Add test_event_single_wait_0_no_block_False test case 2015-09-03 19:54:57 +01:00
Pedro Algarvio
ae9c6c9cff Workaround wait=0 meaning a blocking call when non blocking is required 2015-09-03 18:06:43 +01:00
Pedro Algarvio
dc0fec3be3 Restore backwards compatibility to salt.utils.event 
Fixes #26848
Refs #26000
 2015-09-03 11:11:58 +01:00
Joe Julian
6108ec4280 Gated dbus for os families that use it 
Gated the dbus include for os families that are currently using it
within this module at this time.

Renamed some defs to more appropriately express their function.
 2015-09-01 15:19:49 -07:00
Erik Johnson
d30eaee653 Add http basic auth tests 2015-08-29 21:14:20 -05:00
Erik Johnson
a605607709 Remove git unit tests, moving them to salt.utils.url tests 2015-08-29 21:14:20 -05:00