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
62,023 Commits 24 Branches 182 Tags 341 MiB
b8e4706074
Commit Graph

2179 Commits

Author SHA1 Message Date
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests 
These are being added back as unit tests.
 2016-01-21 15:13:02 -06:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07:00
Thomas S Hatch
ab61f78295 Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable 
Change listen requisite resolution from name to ID declaration
 2015-12-16 15:56:03 -07:00
Paul Fisher
ff3a809c11 Change listen requisite resolution from name to ID declaration 2015-12-16 13:54:49 -08:00
Mike Place
39667fda12 Merge pull request #29240 from clan/linux_acl 
handle acl_type [[d]efault:][user|group|mask|other]
 2015-12-01 10:56:20 -07:00
Z. Liu
02429aca69 handle acl_type [[d]efault:][user|group|mask|other] 2015-12-01 14:55:08 +08:00
Mike Place
d651d7167e Merge pull request #29067 from jacksontj/2015.8 
Fix infinite recursion in state compiler for prereq of SLSs
 2015-11-30 13:27:09 -07:00
Mike Place
2477ff2eab Add __init__ and pydsl test 2015-11-25 10:50:30 -07:00
Mike Place
063f075a99 Add integration renderer tests to the suite 2015-11-25 10:14:46 -07:00
Mike Place
81bf332be4 Migrate pydsl tests to integration test suite 
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
 2015-11-24 15:46:14 -07:00
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
Weilu Jia
64e439cda2 Add test for infinite recursion with sls prerequisites 2015-11-23 09:12:06 -08:00
Mike Place
714ef8ff27 Merge pull request #29057 from lyft/file-manage-local-source-list 
Add local file support for file.managed source list
 2015-11-19 14:57:34 -07:00
Paul Fisher
d175061c5d Add tests for file.source_list with local files 2015-11-18 15:55:44 -08:00
Mike Place
785bf94f55 Add transport setting to shell test 2015-11-12 14:32:39 -07:00
Mike Place
8d3244166b Cast to dict to fix wheel tests in tcp 2015-11-12 12:21:52 -07:00
Mike Place
9b18f372e6 Normalize IPC check among transports 2015-11-11 16:26:32 -07:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8' 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
 2015-11-04 15:52:59 -07:00
twangboy
cf1e059be5 Fixed windows tests 2015-11-02 16:16:22 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
Erik Johnson
0d6a4ac115 Remove non-functional test 
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
 2015-10-24 17:39:16 -05:00
Erik Johnson
86f00e71bf Remove non-functional test 
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
 2015-10-24 17:36:33 -05:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
Mike Place
ba2a39d4b7 Merge pull request #27748 from multani/fix-8646 
Fix #8646
 2015-10-12 09:55:57 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. 
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
 2015-10-05 14:47:25 -06:00
Erik Johnson
519bdd6438 Fix integration tests for worktree addition in git >= 2.6 
The output from 'git worktree add' changed slightly in 2.6.
 2015-09-29 12:01:45 -05: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
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
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
rallytime
d4ad42d697 Update Joyent Cloud Tests 2015-09-04 12:23:05 -06: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
justinta89
1aadbdfc6b Fixed lint error 2015-09-03 13:40:43 -06:00
justinta89
06bea434e1 fixed an unboundlocalerror 2015-09-03 13:16:36 -06: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
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
Colton Myers
3b696d97b3 Fix lint 2015-08-28 17:39:41 -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
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -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
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
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
rallytime
1401255287 Use an available image to test against 2015-08-24 11:45:28 -06:00
Erik Johnson
f033571d7e No shell needed when checking git version 2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92 Add debug logging to troubleshoot worktree test failures 2015-08-24 10:44:08 -05:00
Erik Johnson
b9b44a3434 Don't set global user.name or user.email if they already exist 2015-08-23 23:43:12 -05:00
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-23 08:14:04 +01:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
 2015-08-21 16:44:59 -06:00
Jenkins
41541e4e2b Fix many errors with __virtual__ in tests 
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
 2015-08-21 14:01:03 -06:00
Erik Johnson
73537300cb Lint fixes 2015-08-21 13:48:55 -05:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs 
Update git_pillar docs, add git.list_worktrees function
 2015-08-20 23:34:02 -06:00
Erik Johnson
9a87f052d5 Update class name for old git pillar class 2015-08-20 10:39:36 -05:00
Erik Johnson
43fef21907 Add list_worktrees tests 2015-08-19 19:09:59 -05:00
Jenkins
9149cfbeb2 Fixing more tarfile tests on py2.6 2015-08-19 14:12:18 -06:00
Mike Place
ed71476ca2 Merge pull request #26477 from cachedout/fix_26_tarfile 
Fix integration.modules.git.GitModuleTest.test_archive on py26
 2015-08-19 11:34:06 -06:00
Jenkins
dbbe206e19 Fix integration.modules.git.GitModuleTest.test_archive on py26 
Fix borrowed from: http://stackoverflow.com/questions/6086603/statement-with-and-tarfile
 2015-08-19 11:31:38 -06:00
justinta89
c542895bd2 --annotate and --message aren't valid options in older versions of git. 2015-08-19 09:09:34 -06:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Erik Johnson
b7447fcadb Fix git.clone tests to reflect new return data 2015-08-18 03:39:27 -05:00
Erik Johnson
8dc8eb4b41 Fix test_add_dir 
Paths in the expected output needed to be relative, not full
 2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6 Remove usage of os.chdir except in setUp 
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.

A redundant test has also been removed, was likely a stray copypasta.
 2015-08-18 02:15:21 -05:00
Erik Johnson
dd9bcc896e Lint fixes 2015-08-17 22:10:39 -05:00
Erik Johnson
294aad298e Add proper tests for git execution module 2015-08-17 22:10:39 -05:00
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
Dmitry Kuzmenko
5c6276ac7d Subscribe event to bus is optional now 
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
 2015-08-03 16:10:38 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jason Hamner
24f653e963 Integration Test for Issue 25250 
Adds integration test for #25250
 2015-07-24 13:28:15 -06:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Erik Johnson
a1ffa0c1c4 More test fixes 2015-07-22 10:40:49 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
Justin Findlay
5c94fe3ad3 Merge pull request #25599 from jfindlay/tcp_test 
fix transport settings in #25596
 2015-07-21 17:43:45 -06:00
Justin Findlay
146e6e519a fix transport settings in 3083c71 2015-07-21 16:42:33 -06:00
Mike Place
89e0f151fa Merge pull request #25596 from jfindlay/tcp_test 
Tcp test
 2015-07-21 16:34:56 -06:00
Justin Findlay
a95353b4e3 add tcp transport to shell.key tests 2015-07-20 17:02:25 -06:00
Justin Findlay
3083c71ec3 add tcp transport opt to test runner 2015-07-20 16:52:48 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Seth House
cb98d79cdd Merge pull request #25457 from jacksontj/saltnado 
Saltnado
 2015-07-15 11:50:12 -06:00
Thomas Jackson
bc32f66b98 Add runner_async endpoint to salnado 
Feature for #25427
 2015-07-15 09:07:26 -07:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846 
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
 2015-07-15 14:29:43 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-07-01 19:04:59 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
twangboy
96bc5aed10 Fixed more testing stuff, an egregious error 2015-06-29 12:27:22 -06:00
rallytime
b68e3c0d0c Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version 2015-06-25 15:14:21 -06:00
Thomas Jackson
87adca46e0 Fix memory leak in saltnado 
Fixes #24846

If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
 2015-06-25 09:06:33 -07:00
rallytime
e89564c775 Update Rackspace cloud test file to be more accurate 2015-06-22 10:18:52 -06:00
Nicole Thomas
6fa7e5c5f2 Merge pull request #24833 from rallytime/fix_linode_tests 
Fix linode cloud tests
 2015-06-20 14:15:09 -06:00
rallytime
c56d3150ec Fix linode cloud tests 2015-06-19 10:55:12 -06:00
rallytime
4a0626bf27 Python 3 compat fix 2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad Make the GoGrid Cloud Provider Tests work 2015-06-18 17:08:57 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod 
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
 2015-06-18 09:13:12 -06:00
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in 
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
 2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5 2015-06-17 16:36:36 -06:00
Mike Place
e6dcf3ab12 Merge pull request #24703 from mattmb/fix/onchanges-and-or 
Multiple onchanges requisite behaviour
 2015-06-17 12:26:39 -06:00
Mike Place
d877f4f775 Merge pull request #23383 from cachedout/remove_overstate 
Overstate is dead. Long live orchestrate!
 2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00 Remove overstate tests 2015-06-17 11:14:19 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Colton Myers
5b49e89b43 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-12 11:42:42 -06:00
Justin Findlay
d88fb22fdc fix pkg module integration tests on CentOS 5 2015-06-11 14:56:52 -06:00
Justin Findlay
fb91b40ba0 fix pkg module integration tests on ubuntu 12 2015-06-11 12:46:22 -06:00
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
Justin Findlay
c2db0b1758 fix pkg hold/unhold integration test 2015-06-02 11:56:18 -06:00
Colton Myers
a6a868be6b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/iptables.py
    salt/utils/dictupdate.py
 2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f fix pkg test on ubuntu 12.04 for realz 2015-05-31 22:23:17 -06:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Justin Findlay
9508924c02 fix pkg mod integration test on ubuntu 12.04 2015-05-29 15:52:57 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Justin Findlay
6b6280442c disable intermittently failing tests 
This commit is to be reverted when #23623 is merged.
 2015-05-28 16:23:57 -06:00
Nicole Thomas
fd41993022 Merge pull request #24157 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-27 16:09:00 -06:00
Colton Myers
9dab9a1dda Fix python3 lint 2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
Thomas S Hatch
9cec5d3dc9 Merge pull request #24088 from jfindlay/pkg_tests 
pkg module integration tests
 2015-05-25 13:39:02 -06:00
Justin Findlay
f1bd5ec404 adding pkg module integration tests 2015-05-23 19:34:37 -06:00
rallytime
7146871d73 Revert "Remove key management test from digital ocean cloud tests" 
This reverts commit 1d031caa78.
 2015-05-22 15:33:40 -06:00
Colton Myers
d7362bb5dd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/states/file.py
    salt/utils/event.py
 2015-05-22 13:02:54 -06:00
rallytime
1d031caa78 Remove key management test from digital ocean cloud tests 
The create_key function was added to develop, but isn't present in 2015.5.
 2015-05-21 13:37:34 -06:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
rallytime
9e0ec07d85 Skip the gpodder pkgrepo test - they don't have vivid ppa up yet 2015-05-20 14:08:42 -06:00
rallytime
dce9b540a6 Remove extra line 2015-05-18 14:49:27 -06:00
rallytime
7ed776c293 Cloud tests should use an image that is LTS 
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
 2015-05-18 14:04:24 -06:00