valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,401 Commits 24 Branches 182 Tags 341 MiB
459eaa8945
Commit Graph

2171 Commits

Author SHA1 Message Date
LoveIsGrief
459eaa8945 More rigorous setup precautions for tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
2342940f64 Remove unnecessary import 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
98ad2cbe71 Add virtualbox to profile checks 
Virtualbox needs the 'clonefrom' property and it doesn't need size

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
1995b9ad14 PEP8 docstrings 
double quotes instead of single quotes

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
1545c9de7f Setup testing for calls to salt-cloud 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
4a1a6a962f Move around files for clarity and separation 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
b9ec577d11 Add basic configuration for the tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
c4cb16c379 Post-merge organization 2016-02-10 21:38:11 +01:00
abednarik
b20738a5a1 File state born deprecations. 
Removed all Boron warning and deprecated code.
 2016-02-08 10:01:28 -03:00
Mike Place
5827347884 Merge pull request #30844 from terminalmage/pr-30703 
Perform initial gitfs/git_pillar fetch when init'ing remotes on masterless minion
 2016-02-03 09:31:21 -07:00
Erik Johnson
20c8badf4c Add __role to master opts for gitfs integration tests 2016-02-02 21:29:39 -06:00
justinta89
9b5ce69a54 SyntaxError not appropriately caught. Further testing shows that python2.4 will use print() without an error. 2016-02-01 10:34:24 -07:00
justinta89
0acb145aa1 Adjusting script for cmd.script test 
After #29964 was merged the cmd.script and cmd.script_retcode tests on centos 5
started failing because the /usr/bin/env python version is the system default.
The script used print_fuction from __futures__ which was not introduced until
python2.6.

@The-Loeki, I noticed this after your changes to cmdmod function. If you have
thoughts or comments as to why this behavior changed after that, I'm all ears.
othersie, this should take care of the failures on centos 5 on jenkins.
 2016-01-29 11:52:17 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
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
Stephen D. Spencer
18b4b829e9 . adjust regex to account for the presence/absence of version strings on 
module names (depends on whether or not they're used in the requirements
file)

. finish generalizing pip_successful_install utility function
 2015-12-28 18:48:16 +00:00
Stephen D. Spencer
7373758237 fix indentiation 2015-12-28 18:02:24 +00:00
Stephen D. Spencer
22e89838f2 testing against stdout of a cli utility is for the birds. But I think 
these tests are properly capturing "Success" messages from pip
c.2013-c.2015
 2015-12-28 17:19:05 +00:00
Stephen D. Spencer
4ccfa921b3 add re.DOTALL flag to regex 2015-12-28 15:57:55 +00:00
Stephen D. Spencer
84031b6ce0 additional integration tests to verify chained requirements work 
properly when used in a list of requirements files
 2015-12-28 09:30:19 +00:00
Stephen D. Spencer
878def94fd pip,requirements filej chain support + requirements list arg support 
modules.pip:
 . `requirements` argument now properly supports requirements file
 chaining by default--`no_chown` not required)
 . `requirements` argument can be formed as a list
 . `requirements` files can still be formed as a comma-delimited list
 . both list structures support requirements file chaining

states.virtualenv_mod:
 . had to give states.virtualenv.managed() a little bit of attention to
 provide a cwd argument for modules.pip.installed().  This is done via
 os.path.dirname(os.path.abspath(requirements)) if a requirements
 argument is present

 tests.integration.modules.pip:
    . added:
        test_requirements_as_list__sans_no_chown___absolute_file_path
        test_requirements_as_list__sans_no_chown___non_absolute_file_path
        test_chained_requirements__sans_no_chown___absolute_file_path
        test_chained_requirements__sans_no_chown___non_absolute_file_path
    . all tests passed before commit
 2015-12-26 21:30:27 -06:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
Sergey Kizunov
793c0bef75 Fixed Windows salt-master memory leaks in logger 
__process_multiprocessing_logging_queue:
- A leak was observed in this process on Windows. On Windows, creating a
new process doesn't fork (copy the parent process image). Due to this, we
need to setup extended logging inside this process. The leak was due to
the temp null and temp logging handlers being active which just store
messages but don't process them. Setting up extended logging removes
those handlers and fixes the leak (as well as properly dealing with
incoming logging messages).

setup_multiprocessing_logging:
- A leak was obversed in processes that used this on Windows. Similar
to above, due to lack of fork, the new process will have the temp null
and temp logging handlers enabled, causing the leak. In this function,
removing those handlers prevents the leak.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-12-20 09:05:19 -06:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -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
83df4c4c75 Skip refresh db test if upstream repo does not repsond. 2015-12-16 10:23:10 -07:00
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07: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
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -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
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -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
Christophe Drevet-Droguet
89e7578d21 loader test for external grains deep merge (non-functional) 
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
 2015-11-20 08:44:29 +01: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
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00