valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,910 Commits 24 Branches 182 Tags 341 MiB
e3c66cea3a
Commit Graph

2995 Commits

Author SHA1 Message Date
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
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
Erik Johnson
b45f37a467 Add http basic auth tests 2015-08-28 15:43:24 -05:00
Erik Johnson
1ed42ea4fd Remove git unit tests, moving them to salt.utils.url tests 2015-08-28 15:41:33 -05:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Mike Place
cf487cf0f5 Merge pull request #26709 from rallytime/fix-14612 
Ensure VM name is valid before trying to create Linode VM
 2015-08-27 14:07:49 -06:00
Colton Myers
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592 
Fix Windows failures in pip module due to raw string formatting
 2015-08-27 13:24:53 -06:00
rallytime
a3ac8e7008 Whitespace fix 2015-08-27 11:41:14 -06:00
rallytime
9a4228d906 Added unit tests for new _validate_name function and adjusted regex 2015-08-27 11:17:28 -06:00
Gareth J. Greenaway
c11cf22abe fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net 2015-08-27 08:28:23 -07:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
e2b72b8f8e Merge pull request #26646 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-25 15:15:14 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
Joseph Hall
723734308b Merge pull request #26575 from msteed/raasify-spm 
Update spm for integration into raas
 2015-08-25 12:51:42 -06:00
Erik Johnson
ede057eebc Fix tests to reflect args being passed as lists instead of strings 2015-08-24 23:54:09 -05:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Erik Johnson
49d8bd1dbe Remove unused import 2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Michael Steed
186a4d052c wip: update spm for integration into raas 2015-08-21 16:20:42 -06:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Ivan Babrou
c228088de6 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:42:51 -06:00
Erik Johnson
d2166e95cb Fix formatting 2015-08-21 10:19:36 -05:00
Colton Myers
ff2d6c6045 Fix git test 2015-08-20 16:23:36 -06:00