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
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
rallytime
4acf58e758 Switch digital ocean tests to v2 driver 
This has been done on develop, but this handles the cloud test failures for 2015.5.
 2015-05-18 13:44:08 -06:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
 2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23 update pip tests 2015-05-15 00:15:26 -06:00
rallytime
7e15ff94ff Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests 2015-05-14 15:25:00 -06:00
Justin Findlay
9ea2f477b9 more than ZMQ supported for transport, other typos 2015-05-04 23:24:46 -06:00
Justin Findlay
f58f3dac1d integration test for char escaping in file paths 2015-05-04 23:24:45 -06:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Thomas S Hatch
9ca2d58b10 Merge pull request #23058 from plastikos/improvement-compound_as_list 
[improvement] compound match as list
 2015-04-25 10:57:49 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists 
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
 2015-04-24 17:00:04 -06:00
rallytime
8d5b50e17c Don't forget the blank lines at the end of the file 2015-04-24 16:29:51 -06:00
rallytime
9830708f86 Some small test clean up changes 2015-04-24 16:27:22 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
 2015-04-24 10:19:03 -06:00
Thayne Harbaugh
993373655a Allow grain and pillar delimiter to be specified in compound matcher syntax. 2015-04-23 23:26:49 -06:00
Thomas S Hatch
57999117f2 Merge pull request #22969 from plastikos/improvement-leading_not 
Allow compound expressions to begin with "not"
 2015-04-23 21:44:45 -06:00
Thayne Harbaugh
f155daf700 Update time so that minion startup can timeout. 2015-04-23 10:55:42 -06:00
Thayne Harbaugh
d6fe499f55 Allow compound expressions to begin with "not" 2015-04-22 17:38:17 -06:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
 2015-04-22 11:07:01 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
 2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7 
Test with a more recent pip version to avoid a traceback
 2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback 
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
 2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
Thomas Jackson
98af7c3f95 Cleanup jinja attribute access for loader 
Refactor of #22723
 2015-04-21 22:39:17 -07:00
Pedro Algarvio
f7e6f716e3 Make PEP-8 checker happier 2015-04-21 20:35:14 -06:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
Pedro Algarvio
ae2bca1f6f Fix W1504(unidiomatic-typecheck 2015-04-21 14:02:17 +01:00
Justin Findlay
03af523de9 Merge pull request #22853 from s0undt3ch/2014.7 
Don't assume package installation order.
 2015-04-20 20:42:41 -06:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/beacons/service.py
 2015-04-20 11:41:25 -06:00
Thomas S Hatch
a7ff60491b Merge pull request #22815 from plastikos/issue-22797 
Fix failure with nested nodegroups:
 2015-04-20 09:12:54 -06:00
Pedro Algarvio
b62df62151 Don't assume package installation order. 
Additionally pep8 when installed using wheel, reports the version
together with the name.
 2015-04-20 14:45:25 +01:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups: 
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
 2015-04-17 15:20:34 -06:00
Justin Findlay
1097d2587a Merge pull request #22798 from rallytime/pylint-develop 
Python 3 compat fixes for develop
 2015-04-17 13:14:45 -06:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Tomas Sirny
42d26cc699 Shorter disk resource definition 2015-04-17 16:30:06 +02:00
Tomas Sirny
5d93b7619d Working test for extended profile 2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74 Allow setting multiple disks and scopes on create of instance for GCE 2015-04-17 15:40:08 +02:00
Colton Myers
11356cb0c6 Use print_function 2015-04-16 12:16:44 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
94e4e6bc1e Merge pull request #22723 from thatch45/lazy_layers 
Fix the lazy loader to keep a top level key ref
 2015-04-16 10:36:26 -06:00
Thomas S Hatch
c003252a8e Fix test 2015-04-16 09:33:50 -06:00
Thomas S Hatch
f8cdc5060e fix sysdoc tests for new module level hooks 2015-04-15 19:42:23 -06:00
Thomas S Hatch
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Thomas S Hatch
b626149245 fix tests 2015-04-15 11:59:25 -06:00
Colton Myers
a02ced40f0 Lint 2015-04-14 12:57:25 -06:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Thomas S Hatch
2d9b6eb1e0 Merge pull request #22545 from dmyerscough/digital-ocean-v2-tests 
Digital Ocean APIv2 Integration Testing
 2015-04-13 11:17:20 -06:00
Mike Place
6a11ead5b4 Merge pull request #22453 from jacksontj/transport 
Abstracted Transport
 2015-04-13 09:38:52 -06:00
Colton Myers
5b6d410119 Fix calltest 2015-04-11 15:59:06 -04:00
Colton Myers
99744b9568 Fix lint 2015-04-11 15:56:09 -04:00
Colton Myers
cc8785e980 Fix the test.fib tests 2015-04-11 14:48:59 -04:00
Damian Myerscough
f51fd0349a Fix pylint error 2015-04-10 23:16:20 -07:00
Damian Myerscough
c6e618bc5f Digital Ocean APIv2 Integration Testing 2015-04-10 21:30:09 -07:00
Joshua Semar
d9ed9f1e5b fix linting errors 2015-04-10 16:35:07 +00:00
Joshua Semar
c56845e904 include mod_opts on tornado application, refactor get_app 2015-04-10 15:06:30 +00:00
Thomas Jackson
77395d76d8 Change to sets, we don't gaurantee minion ordering in returns 2015-04-09 09:06:59 -07:00
Thomas Jackson
7614f7ed10 Caste returns to sets, since we don't care about order. 2015-04-09 07:45:24 -07:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups 
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
 2015-04-08 23:16:39 -06:00
Pedro Algarvio
35b3cdcc82 Get the first iteration the right way 
Fixes `TypeError: 'dictionary-valueiterator' object has no attribute '__getitem__'`
 2015-04-08 19:43:55 +01:00
Thomas Jackson
d21e180a5a Fix race condition in integration test startup 2015-04-07 21:01:43 -07:00
Thomas Jackson
064896d4d9 Update commented out version as well 2015-04-07 20:53:20 -07:00
Thomas Jackson
e376b283ef Refactor the start_daemon function 2015-04-07 20:53:20 -07:00
Thomas Jackson
403c81c2a6 Move daemon init and execution into the same process. 
These daemon processes aren't all thread safe, so having the test suite init then fork is disingenuous since that isn't supported anyways.
 2015-04-07 20:53:20 -07:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Thomas S Hatch
80a194bc20 Merge pull request #22401 from jfindlay/api_tests 
sort integration test minion return lists
 2015-04-07 09:15:44 -06:00
Thomas S Hatch
234cb65a23 Merge pull request #22319 from plastikos/improvement-pillar_pcre 
Improvement: add pillar PCRE matching
 2015-04-07 09:09:49 -06:00
Justin Findlay
fceb83bf16 sort integration test minion return lists 2015-04-06 22:07:56 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Mike Place
ce0fb585de Merge pull request #22344 from jfindlay/bp-21652 
Backport #21652 from develop to 2015.2
 2015-04-06 11:25:26 -06:00
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords. 
Fixes #22359
 2015-04-05 01:00:08 +01:00
Thayne Harbaugh
a7a33b381c Various fixes: 
* Add missing spaces in help
   * Correct order of arguments to _check_cache_minions() (not part of pillar_pcre)
   * Add platening of pillar_pcre to pillar_exact_minions
   * Add missing match to pillar_pcre
   * Correct unit test
 2015-04-03 18:32:52 -06:00
Justin Findlay
fb8b1858a7 shell {en|dis}abled tests for cmdline, templates 2015-04-03 18:08:13 -06:00
Mike Place
f3df92834d More helper text, refactor filehandles, clean up 2015-04-03 15:34:47 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00
Thayne Harbaugh
c91392bc91 Add option -J/--pillar-pcre to match on pillar PCREs 2015-04-03 02:47:19 -06:00
Justin Findlay
a927087f64 debug rest_tornado test error 2015-04-02 09:05:48 -06:00
Colton Myers
0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    salt/beacons/service.py
    salt/beacons/sh.py
    salt/modules/cassandra_cql.py
    salt/returners/cassandra_cql_return.py
 2015-04-01 14:22:33 -06:00
Thomas S Hatch
8ec0c820a6 Merge pull request #22253 from rallytime/merge-22246 
Merge #22246 with pylint fix and test cleanup
 2015-04-01 13:03:27 -06:00
rallytime
7b859df4d1 Merge #22246 with pylint fix and test cleanup 
Refs #22246
 2015-04-01 10:29:23 -06:00
Thomas Jackson
d70e094183 Add initial tests for loader's public interfaces 
Tests for #22117
 2015-04-01 07:55:02 -07:00
Colton Myers
ed51f2bb7c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-31 11:25:27 -06:00
Joshua Semar
a5b28ad24d fix tests return value 2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5 fix cas behavior on data module 
data.cas was not saving changes.  We now call dump after
receiving the change
 2015-03-30 16:01:28 -05:00
Colton Myers
c91a593507 Fix test to give more data on failure 2015-03-27 16:50:39 -06:00
Colton Myers
3c5f9af2d4 Lint (blank lines) 2015-03-21 15:36:04 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
 2015-03-20 20:09:19 -06:00
Colton Myers
d82d7645c9 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/cmdmod.py
    salt/modules/debian_ip.py
    salt/modules/drac.py
    salt/modules/rpm.py
    salt/returners/postgres_local_cache.py
 2015-03-19 16:13:16 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
 2015-03-19 16:03:29 -06:00
Thomas S Hatch
55a35c809d Merge pull request #21755 from jacksontj/2014.7 
Add timeout to saltnado's event listener
 2015-03-18 11:49:38 -06:00
Thomas Jackson
234d02b218 Add timeout to saltnado's event listener 
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
 2015-03-18 08:09:41 -07:00
Thomas Jackson
205787c256 Add timeout to saltnado's event listener 
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
 2015-03-17 19:17:32 -07:00
Justin Findlay
f735f0b96d add eauth pam group tests 
Adds test for #17380.
 2015-03-17 14:25:57 -06:00
Mike Place
baf2c40f88 More helper text, refactor filehandles, clean up 2015-03-13 16:15:23 -06:00
Mike Place
d04062a5ad Remove loop interval setting, was causing cpus to spin 2015-03-13 16:00:32 -06:00
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/virt.py
 2015-03-11 16:09:57 -06:00
Thomas S Hatch
13b7046227 Merge pull request #21461 from jfindlay/refactor_crons 
Refactor unix crons
 2015-03-11 09:52:28 -06:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Justin Findlay
5dc09e7da1 update cron and cmd tests for cron runas changes 2015-03-10 15:57:24 -06:00
Erik Johnson
d71e9de859 Fix test_envs fileserver runner test 
The change in runner output behavior caused the output of test_envs to
change, causing some changes to need to be made in da163471 to get them
to pass. Now that runner output is fixed, the test was returning the
output it should have been in the first place. This commit changes that
test back so that it now expects a list as output.

Additionally, I've taken the opportunity to add additional test calls to
test the "backend" argument for those functions which now have it.
 2015-03-10 11:28:59 -05:00
Vincent Desjardins
d5293901bc fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-10 09:17:48 -06:00