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
59,620 Commits 24 Branches 182 Tags 341 MiB
cc34a57ffe
Commit Graph

5788 Commits

Author SHA1 Message Date
Justin Findlay
2c8beb238f Merge pull request #27026 from rallytime/bp-27011 
Back-port #27011 to 2015.5
 2015-09-10 15:13:45 -06:00
Seth House
f8518d545f Move giant eventlisten.sh example out of the state.event docstring 
This is more interesting than directly useful and doesn't need to
clutter the docs.
 2015-09-10 13:38:09 -06:00
Justin Findlay
801f2eadb5 Merge pull request #26874 from evverx/use-localectl-on-jessie-and-vivid 
Use localectl for locale setting/getting on Debian if available
 2015-09-10 13:30:05 -06:00
Erik Johnson
30a4915762 Update tests to reflect changes to timezone module 2015-09-10 11:05:38 -05:00
Seth House
af44413db1 Move giant eventlisten.sh example out of the state.event docstring 
This is more interesting than directly useful and doesn't need to
clutter the docs.
 2015-09-10 08:51:23 -06:00
Seth House
e47fe835c9 Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-09 10:39:35 -06: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
Nicole Thomas
eddb532713 Merge pull request #26915 from rallytime/joyent-tests 
Update Joyent Cloud Tests
 2015-09-09 09:04:50 -06:00
FELD Boris
23c7b4847c Improve support for Content-Type parsing. Ref #26505 
It currently supports 'simple' values like application/json, but Content-Type
header could also includes parameter. See RFC http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17.

When sending JSON from a browser for example, the Content-Type is
`application/json; charset=utf-8` and salt-api failed to detect JSON content.

The proposition is to use cgi.parse_header method (https://docs.python.org/2.7/library/cgi.html?highlight=cgi#cgi.parse_header)
to correctly parse the Content-Type value but ignore parameters, JSON should
always be UTF-8 but I don't know about other supported Content-Type.
 2015-09-09 16:41:29 +02:00
Seth House
d68aefcfde Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-08 15:40:06 -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
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
rallytime
d4ad42d697 Update Joyent Cloud Tests 2015-09-04 12:23:05 -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
Evgeny Vereshchagin
8f77b743cd Use localectl for locale setting on Debian if available 2015-09-04 04:06:55 +03: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
Joseph Hall
8cdf75c8e3 Merge pull request #26896 from msteed/spm-hash-file 
spm remove: use pkgfiles to calculate file hashes
 2015-09-03 15:40:39 -06:00
Nicole Thomas
6a7be957d9 Merge pull request #26891 from jtand/azure_version 
Fixed an unboundlocalerror
 2015-09-03 15:21:36 -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
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
justinta89
1aadbdfc6b Fixed lint error 2015-09-03 13:40:43 -06:00
Mike Place
ef76af9596 Merge pull request #26892 from cachedout/fix_async_tcp-test 
Make the testing ioloop the current one
 2015-09-03 13:29:11 -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
justinta89
06bea434e1 fixed an unboundlocalerror 2015-09-03 13:16:36 -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
justinta89
8c42178e1a Fixed a lint error 2015-09-03 10:21:41 -06:00
justinta89
5a33017791 Gets the azure version correctly on python-azure 1.0.0 2015-09-03 10:00:36 -06:00
Pedro Algarvio
dc0fec3be3 Restore backwards compatibility to salt.utils.event 
Fixes #26848
Refs #26000
 2015-09-03 11:11:58 +01:00
Pedro Algarvio
00b9cc9a83 Only place salt's code root dir in sys.path, not anything above that 2015-09-03 10:49:01 +01:00
Erik Johnson
22341b3139 Add debug logging 
This is a massive test function with steps dependent on each other.
These log messages make it easier to look through the log file to
troubleshoot failures.
 2015-09-02 20:58:06 -05:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05: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
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Mike Place
3c4523237f Merge pull request #26810 from Unity-Technologies/feature/global-environ-win 
Added the ability to set permanent environment variables on windows
 2015-09-01 11:42:06 -06:00
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Daniel Hobley
fc724158de Added the ability to set permanent environment variables on windows 2015-08-31 13:47:29 +02: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
3b696d97b3 Fix lint 2015-08-28 17:39:41 -06:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06: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
Colton Myers
2db2451cdf Merge pull request #26607 from cachedout/minion_opts_dep 
Minion opts generation in yaml test
 2015-08-28 10:00:07 -06:00
Colton Myers
9e88672e5a Merge pull request #26683 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-27 15:28:14 -06:00
Colton Myers
5628702dd2 lint 2015-08-27 14:41:31 -06:00
Mike Place
cfc61c6629 Merge pull request #26688 from richardhansen/states.host.only 
new salt.states.host.only() function to limit names associated with an IP
 2015-08-27 14:23:00 -06:00
Colton Myers
4f441179aa Test fixes 2015-08-27 14:11:34 -06:00
Colton Myers
e9674b541f Another file_test fix 2015-08-27 14:08:14 -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
Mike Place
d3abc786cb Lint 2015-08-27 13:46:29 -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
Erik Johnson
96c559d63e tests/unit/states/eselect_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
2d51f3d25b tests/unit/states/dockerng_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
9fee076477 tests/unit/pydsl_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
106f386df3 tests/unit/modules/cron_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
f4e232bc01 tests/jenkins.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
b401328558 tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
8053d1f952 tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
e2342aadb7 tests/integration/modules/state.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
93e2f4eff7 tests/integration/modules/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
d6b4e8d033 tests/integration/__init__.py: remove raw string formatting 2015-08-26 23:26:07 -05:00
Erik Johnson
84cc66b7b9 tests/buildpackage.py: remove raw string formatting 2015-08-26 23:26:07 -05:00
Colton Myers
ca3f40b94e More test fixing 2015-08-26 19:32:31 -06:00
Richard Hansen
7457f2302d salt.states.host.only: new function to limit to specific hostnames 2015-08-26 20:21:45 -04:00
Richard Hansen
9af7f900d4 salt.modules.hosts.set_host: remove entry if alias is empty 2015-08-26 20:21:45 -04:00
Colton Myers
a9cdb633a4 Fix failing test 2015-08-26 16:08:50 -06:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Colton Myers
40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/modules/win_service.py
    tests/integration/cloud/providers/digital_ocean.py
 2015-08-26 14:29:57 -06:00
Colton Myers
9b34335a20 Merge pull request #26359 from Akilesh1597/develop 
Ini issues fixed
 2015-08-25 15:47:48 -06:00
Colton Myers
6e72ae7f91 Merge pull request #26647 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-25 15:15:28 -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
353ec1ba7a Remove bad test 2015-08-25 14:08:04 -06:00
Colton Myers
3d6f7b0e6a Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/utils/aws.py
 2015-08-25 13:57:49 -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
rallytime
c0d83d558d Don't use id as variable 2015-08-25 11:03:30 -06:00
rallytime
2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output 2015-08-25 11:01:02 -06:00
rallytime
b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests 2015-08-25 10:44:28 -06:00
rallytime
9ae1539c62 Update cloud tests to be more efficient and accurate 2015-08-25 09:49:32 -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
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
rallytime
9ae27193d8 Also add -Z to script args for cloud tests 2015-08-24 16:02:26 -06:00
Nicole Thomas
2964700609 Merge pull request #26619 from rallytime/cloud-test-fixes 
Apply cloud test fixes from 2015.5 to 2015.8
 2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11 Merge pull request #26603 from terminalmage/issue13550 
Fixes for git.latest, git module integration tests, etc.
 2015-08-24 16:47:16 -05:00
Nicole Thomas
ed166ebd4f Merge pull request #26618 from rallytime/pip-undate-cloud-tests 
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
 2015-08-24 15:15:24 -06:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
7b594ef6d6 Use an available image to test against 2015-08-24 15:12:19 -06:00
rallytime
5a2c8825ba Extra lines 2015-08-24 15:02:44 -06:00
rallytime
d28672b69e Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:01:30 -06:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00