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
87,177 Commits 24 Branches 182 Tags 341 MiB
7374403eca
Commit Graph

511 Commits

Author SHA1 Message Date
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427 
Correct issue where duplicate items in grains list during state run will result in duplicate grains
 2016-02-25 13:15:20 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Mike Place
30eb5fccf7 Additional tests, but disable the test for distinct lists, because of a problem with context in test suite 2016-02-24 13:53:49 -07:00
justinta89
421a112914 Added config_dir to test minion config 2016-02-23 19:40:22 -07:00
Mike Place
e1ade05e54 Merge pull request #31355 from rallytime/fix-31330 
Fix orchestrate outputter when retcode is appended to orchestrate run
 2016-02-22 11:13:07 -07:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Justin Findlay
8623c24335 add integration tests for minion blackout 
Related to #30868.
 2016-02-19 18:04:31 -07:00
rallytime
9b52e39e90 Add testcase for state.orchestrate output 2016-02-19 09:14:46 -07:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Mike Place
9281ff5b1f Merge pull request #31307 from LoveIsGrief/salt-27089-new 
[Recreated]Saltcloud virtualbox provider
 2016-02-18 08:56:21 -07:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
LoveIsGrief
6cfb447cff Introduce profiles for testing 
* virtualbox-deploy-conf won't deploy a script
* virtualbox-minion will do a full deploy with a minion config

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
1a8cd747c5 Feature: deploy salt on machine when creating 
We need to setup the tests with a profile that wants to deploy and use the profile

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
59d212acb1 Provider is getting deprecated in the config 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
b0752a3d82 Implement list_nodes_select 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +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
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
b9ec577d11 Add basic configuration for the tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
Erik Johnson
ef14956db0 Integration test for #30820 2016-02-02 15:34:19 -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
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00: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
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
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
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
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
f13e9435b1 loader test for custom grains 2015-11-18 22:08:24 +01:00
Dmitry Kuzmenko
435e8fc4d9 Fix tests: add module function docstring 2015-10-26 16:07:52 +03:00
Dmitry Kuzmenko
df2b40e854 Fixed @depends integration test 2015-10-26 16:07:52 +03:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -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
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
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
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
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
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
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
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
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
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
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
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Damian Myerscough
c6e618bc5f Digital Ocean APIv2 Integration Testing 2015-04-10 21:30:09 -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
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -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
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
Justin Findlay
f735f0b96d add eauth pam group tests 
Adds test for #17380.
 2015-03-17 14:25:57 -06:00
Mike Place
d04062a5ad Remove loop interval setting, was causing cpus to spin 2015-03-13 16:00:32 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
Tomas Sirny
494d7069fd Working basic test for GCE cloud provider 2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae Template configs for GCE cloud provider 2015-03-08 16:44:14 +01:00
Thomas Jackson
7a5ac0245d Pylint fix 2015-03-06 17:47:18 -08:00
Thomas Jackson
9fa37fd46b Add raw boolean support to depends decorator 2015-03-05 21:59:10 -08:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
rallytime
b51492486f Add Joyent cloud provider tests 2015-02-20 17:25:07 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
rallytime
c3f786c966 listen and listen_in requisite tests 2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5 onfail and onfail_in requisite tests 2015-02-19 14:35:26 -07:00
rallytime
208b4906d8 Onchanges and onchanges_in requisite tests! 2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66 Add one onchanges requisite test 2015-02-18 17:16:07 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
 2015-01-07 14:49:58 -07:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Elias Probst
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
Pedro Algarvio
b425c20919 2 of 500000 
Let's not hardcode the SSH tests to the root user without the need for
that.
 2014-11-06 19:42:59 +00:00
rallytime
b49c677af8 Merge branch '2014.7' into merge_forward 
Conflicts:
	salt/daemons/flo/core.py
	salt/daemons/salting.py
	salt/minion.py
	salt/modules/introspect.py
	salt/modules/lxc.py
	salt/modules/sysmod.py
	salt/runners/doc.py
	salt/states/cloud.py
	salt/transport/__init__.py
	salt/utils/github.py
 2014-11-04 10:07:02 -07:00
rallytime
92fc46607f Don't use HVM image type. 2014-11-03 16:12:21 -07:00
rallytime
e272c41bb8 Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6 2014-11-03 15:13:14 -07:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests 
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
 2014-10-24 16:14:02 -06:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
Thomas S Hatch
b2e730a2a6 Merge pull request #16158 from thatch45/pillar_opts_false 
Set pillar_opts to default to False
 2014-10-13 14:33:44 -06:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file" 
This reverts commit 1ccec204b2.
 2014-09-16 08:40:43 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
b30e750a8a Azure cloud tests 
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
 2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
rallytime
40253cb47b Update ec2 provider and profile config files for cloud nightly tests 2014-09-08 17:06:45 -06:00
rallytime
1727d04701 Generate random cloud provider names on digital ocean 2014-09-05 15:57:00 -06:00
rallytime
6de2a37ec8 Generate random cloud instance name on rackspace tests 2014-09-05 14:09:42 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
Mike Place
c3d0b5cba5 Dummy file to fix failing tests. 2014-07-01 15:58:01 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit 
File perms no exit
 2014-06-30 17:43:54 -06:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
rallytime
c001f717a4 Fix digital ocean provider integration tests 2014-06-24 14:33:15 -06:00
Aditya Kulkarni
8ee2e01092 Change from auto to pam 2014-06-24 14:17:54 -04:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00
rallytime
da839f9ec7 salt-cloud tests for digital ocean 2014-06-09 14:49:49 -06:00
rallytime
7689a9bc99 salt-cloud tests for linode 2014-06-09 14:49:49 -06:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Mike Place
f3733fabf4 Clean up sshd config. 
Remove hostkeys that are now dymaically generated per-run.

No more usepam
 2014-05-23 15:04:11 -06:00
Mike Place
7abc25f67f Generate server keys too 2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53 Working salt-ssh test runner 
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
 2014-05-23 14:11:14 -06:00
Elias Probst
f57dce2224 Correct usage of 'CLI Example' in documentation blocks 
This mass-edit was done using the following shell command:
ack --python -l '^(\s*)CLI Example::$' \
| xargs sed -i \
's/^\(\s*\)CLI Example::/\1CLI Example:\n\n\1.. code-block:: bash/g'
 2014-05-14 19:29:49 +02:00
Pedro Algarvio
6b1380a25c Move sshd_config file to another directory to avoid problems. 2014-05-12 19:06:09 +01:00
Mike Place
d7bba818a9 Only listen on localhost. 2014-05-10 14:18:53 +01:00
Mike Place
0cbac67a3f Support for continuous integration testing of salt-ssh 2014-05-10 14:18:53 +01:00
Pedro Algarvio
33f361e99d Don't use the deprecated keyword argument 2014-04-24 09:06:28 +01:00
Thomas S Hatch
9ed1e172e3 Maybe this will fix the ubuntu tests on jenkins! 2014-04-02 11:02:03 -06:00
Thomas S Hatch
d478a16ef5 These tests should have never worked!! 2014-04-02 10:27:04 -06:00
Pedro Algarvio
1ef4cd11cb Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Thomas S Hatch
94a6b01522 Merge pull request #10011 from makinacorpus/fix10010 
display full jinja traceback when applicable
 2014-01-29 07:41:29 -08:00
Mathieu Le Marec - Pasquet
a6b3bf4167 Lint fix 2014-01-29 02:43:19 +01:00
Mathieu Le Marec - Pasquet
688abda402 display full jinja traceback when applicable 
This fixes #10010
 2014-01-29 02:04:12 +01:00
Mathieu Le Marec - Pasquet
165b5e4af2 Handle better state errors 
This fixes #9983.
 2014-01-28 16:01:34 +01:00
Thomas S Hatch
b90b4a0db8 Set tests to refresh fs list cace with every check 2014-01-09 15:10:42 -07:00
Mike Place
444cae7236 Integration test fix 
* oscodename should not have been removed.
 2013-12-27 13:25:05 -07:00
Mike Place
9a8b9ab49d Fix Ubuntu integration tests. 
Ubuntu changed the name of the software-properties package, breaking tests. Details here: https://bugs.launchpad.net/ubuntu/+source/ubuntu-meta/+bug/439566
 2013-12-27 09:40:07 -07:00
Ollie Walsh
14da357576 Increase master timeout during tests now that it is not incorrectly incrementing 2013-12-17 01:49:08 +00:00
Seth House
7cfaca6ddb Add basic lowdata test for master_call 2013-12-13 16:00:34 -07:00
Thomas S Hatch
476f0b8a25 Apply yaml_utf8 to test config 2013-12-13 15:20:50 -07:00
regilero
2e48812cfa Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-12 22:10:50 +01:00
Mike Place
d59d8ecfd7 Fileserver integration testing. 
Finished the roots integration tests for now. Started on GitFS testing.
 2013-12-10 17:45:54 -07:00
regilero
3b14cd7cb4 Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-11 00:56:56 +01:00
Erik Johnson
685d1d36de Fix requisite tests 
Now that state.func_name is invalid in requisites, remove them from this
test.
 2013-12-06 15:16:57 -06:00
regilero
b376d1a82b MySQL States integration module with db tests 2013-12-04 22:33:33 +01:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Pedro Algarvio
13a9effdaf Add unit tests regarding include.d directories loading. 2013-12-03 19:08:30 +00:00
Mathieu Le Marec - Pasquet
e9246d2a77 Remove bootstrap.py's & adapt tests for zcbuildout module 2013-12-03 17:53:58 +00:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support 
This fixes #8856.
 2013-11-29 18:51:20 +00:00
Joseph Hall
b32e8901d0 Merge pull request #8899 from terminalmage/tests 
Simplify jinja syntax for ubuntu pkgrepo test deps
 2013-11-28 10:31:21 -08:00
Erik Johnson
13dbb9efab Simplify jinja syntax for ubuntu pkgrepo test deps 
See the below discussion for more info:

https://github.com/saltstack/salt/pull/8872#discussion-diff-7981734R64
 2013-11-28 12:27:39 -06:00
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Erik Johnson
0ffce3ce6d Fix ubuntu deps for pkgrepo integration tests 
This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
 2013-11-27 20:01:14 -06:00
Thomas S Hatch
33a719c1d4 Merge pull request #8848 from terminalmage/tests 
Add pkgrepo.managed test SLS for Ubuntu
 2013-11-27 08:10:12 -08:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Erik Johnson
55b870e43a Add pkgrepo deps for ubuntu 
This fixes travis failures due to needed python module not being
installed.
 2013-11-26 23:55:26 -06:00
Erik Johnson
f56ad56a5a Add pkgrepo.managed test SLS for Ubuntu 
pkgrepo.absent is not behaving properly, will add a test case for
pkgrepo.absent later once I've had a chance to troubleshoot.
 2013-11-26 23:22:59 -06:00
Thomas S Hatch
079c849adf Merge pull request #8834 from cro/dockerio_cleanup 
Add some tests for docker integration.
 2013-11-26 11:18:22 -08:00
C. R. Oldham
10ef0de5f6 Add some tests for docker integration. 2013-11-26 12:13:25 -07:00
Thomas S Hatch
5637339b2c Merge pull request #8823 from regilero/requisites-fix 
Fix #8773: allow syntax error state.foo in requisites with a warning.
 2013-11-26 08:07:40 -08:00
Thomas S Hatch
25dcbefb9c Merge pull request #8820 from terminalmage/tests 
Add pkgrepo tests for CentOS
 2013-11-26 08:05:34 -08:00
regilero
4497751420 Fix #8773: allow syntax error state.foo in requisites with a warning. 2013-11-26 11:57:09 +01:00
regilero
ab88a276dc remove test for issue #8976 closed as expected behavior 2013-11-26 10:51:47 +01:00
Erik Johnson
c2e346835c Add pkgrepo tests for CentOS 
Ubuntu ones will follow soon.
 2013-11-25 17:20:32 -06:00
regilero
9b20a408a4 commented tests for issue 8802 use recursion undetected 2013-11-25 15:35:22 +01:00
regilero
38bd6709f0 require vs require_in in not-list yamlsyntax: differences, still on #8235 2013-11-25 12:58:59 +01:00
regilero
58bfbff843 prereq tests for issue #8235 (yaml without lists) and error message difference in no-list mode 2013-11-25 12:46:02 +01:00
regilero
8024df8404 Add test for #8796: use does not inherit require. False test actually 2013-11-25 11:06:37 +01:00
regilero
5d248146df Remove wrong comments on prereq working test 2013-11-24 18:33:15 +01:00
regilero
aaa6f44677 Missing states for the mixed require and prereq mixed tests 2013-11-24 18:30:44 +01:00
regilero
8177f2b609 Add another working prereq simple test 2013-11-24 18:30:15 +01:00
regilero
0354e408e3 Comments on require test example 2013-11-24 18:28:59 +01:00
regilero
ddb99a570d require and prereq mixed tests, mostly failing, see #8785 2013-11-24 18:28:22 +01:00
regilero
ab4ee0ba1f full sls require test, and yet to do check for require_in or prereq #8233 2013-11-23 18:56:07 +01:00
regilero
7b01991c0a require recursion and still not done prereq recursion 2013-11-23 18:20:15 +01:00
regilero
a99cd0eafd Use requisite 2013-11-23 17:26:37 +01:00
regilero
6a7d35bc59 commented test for issue #8211 complex prepreq 2013-11-23 16:59:10 +01:00
regilero
e4c68d1a94 small typo 2013-11-23 16:47:10 +01:00
regilero
ceb5963094 Prereq and prerequ_in tests 2013-11-23 16:39:19 +01:00
regilero
407533dfa5 require and require_in tests 2013-11-23 16:37:57 +01:00
Jeffrey C. Ollie
b1fb52a680 fix more funcion => function typos 2013-11-15 14:50:17 -06:00
Pedro Algarvio
56129e3610 Include the holy directory for the __env__ selection test cases. 2013-11-06 20:04:54 +00:00
Pedro Algarvio
0a03ecc6bc Add required state file. 2013-11-06 20:04:10 +00:00
Pedro Algarvio
e334e232d1 Forgot to add the top file. 2013-11-06 20:04:10 +00:00
Pedro Algarvio
ec76b188b1 Correctly trigger the issue reported on #8196. 2013-11-06 20:03:44 +00:00
Pedro Algarvio
2924f1c14a Add a test case to check for proper env selection when passing ?env=foo. Refs #8196. 2013-11-06 20:03:44 +00:00
regilero
089787cead Integration tests for #8174, #7905 & #8114: sls syntax errors 2013-10-31 14:30:25 +01:00
Pedro Algarvio
4b46ee5017 Remove unnecessary imports. 2013-10-26 18:59:44 +01:00
Pedro Algarvio
ce553415cc Provide test case to prove proper loader function override. Refs #8096. 2013-10-26 18:06:28 +01:00
C. R. Oldham
66e3be46d1 Make sure multiple names clauses retain same order 2013-10-18 14:57:48 -06:00
C. R. Oldham
8793429f72 Make sure that ssh keys don't get added with incorrect encoding types. 2013-10-15 11:48:28 -06:00
David Anderson
ec4475cf30 Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars 2013-10-11 11:53:00 -06:00
Pedro Algarvio
e18ba0758b Don't include authorship in generated documentation, the Sphinx way. 2013-09-16 17:24:00 +01:00
David Boucha
2dc500d1d7 remove trailing space 2013-09-01 23:40:39 -06:00
Thomas S Hatch
de53840457 Reduce test suite worker threads to 3, the peer system does not 
need extra procs anymore
 2013-08-12 22:33:59 -06:00
Pedro Algarvio
e467b1e00b Simplify the Syndic configuration testing. 
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
 2013-07-17 16:22:18 +01:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable 
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
 2013-07-15 20:30:26 +00:00
Pedro Algarvio
5c3a406e17 Let us not use a deprecated option ourselves unless for testing the deprecation. 2013-07-13 19:55:50 +01:00
Pedro Algarvio
a886eaa03d Add a state integration test case for #5940. 2013-07-05 23:00:14 +01:00
Thomas S Hatch
ec2ab4d5d3 Fix up tests for decorators 2013-06-20 11:21:56 -06:00
Thomas S Hatch
17f292a21a Add ignores for loaded depends modules 
@jacksont, just fyi, we check the loaded modules for docstrings
 2013-06-18 16:38:42 -06:00
Thomas Jackson
3016999c04 Adding "Depends" decorator to salt.utils 
The Depends decorator allows you to optionally remove functions if sepecific globals/modules don't exist. This is particuarly helpful in larger scale deployments where some functions of the module work everywhere, but others require (for example) a service to be installed. This way you can avoid having to try/except all over the module to only load certain functions etc.
 2013-06-14 15:17:06 -07:00
Thomas S Hatch
dad4b18c93 Add overstate to check parse failures in requisites 2013-06-10 23:00:22 -06:00
Thomas S Hatch
815cb47a36 Add sls that will fail to parse 2013-06-10 23:00:02 -06:00
Thomas S Hatch
e228768961 Add overstate to test requisites 2013-06-10 18:42:54 -06:00
Thomas S Hatch
1bcca1aae3 Add a generic failing sls for tests 2013-06-10 18:42:54 -06:00
Ollie Walsh
1eca34f8e6 Give supervisor a little time to startup during tests 2013-05-29 11:39:09 +01:00
Ollie Walsh
4948914766 Add missing test file 2013-05-29 00:47:25 +01:00
Thomas S Hatch
2b917aef23 Add loop_interval to minion config for tests 2013-05-28 14:27:01 -06:00
Thomas S Hatch
d48702aaa5 Add mine_functions to grains 2013-05-26 06:59:13 -06:00
Thomas S Hatch
f71a4ee2c8 Add more checks to config 2013-05-26 03:42:41 -06:00
Thomas S Hatch
e6c369c5ec Add opts to master file to test config module 2013-05-26 00:31:43 -06:00
Thomas S Hatch
6b01c8380d Add pydsl runtime test per #5055 2013-05-18 22:51:53 +00:00
Pedro Algarvio
397418dad7 We're no longer leaking threads. Travis-CI should be OK with 10 worker threads. 2013-04-28 08:16:54 +01:00
Thomas S Hatch
cebdf76f2e Fix publish tests 2013-04-27 12:59:34 -06:00
Jeroen Dekkers
b40242e409 Make ssh key regular expression more strict 2013-03-08 15:01:58 +01:00
Thomas S Hatch
47e08fc4fa Remove failing test, I am not sure how it ever passed... 2013-02-06 12:48:33 -07:00
Erik Johnson
77eeb47bea Add tests for nested grain/pillar matching 
Also added tests for traditional grain matching when target grain is a
list.
 2013-01-26 00:13:51 -06:00
Thomas S Hatch
f94637b4b4 Add a pilla rlist to test advanced pillar matching 2012-12-12 16:30:17 -07:00
Pedro Algarvio
7c5a5d0bd3 Header updates. More copyright to the SaltSatck team. Code author to me(where applicable). 2012-12-11 10:23:37 +00:00
Henrik Holmboe
acc49904cd Remove references to pub_refresh. 
The configuration option was removed in 0.10.5.
 2012-11-29 16:44:49 +01:00
Ryan Schneider
ad1a43012a Add gzip and template to cp.get_dir, expose make_dirs on cp.get_file 2012-11-14 16:48:26 -08:00
Pedro Algarvio
7c666d21d0 Need at least two worker threads for integration.modules.publish to pass. 2012-11-13 19:10:17 +00:00
David Boucha
4a2ceb458e set worker threads to 1 for testing 
Travis CI is failing on python 2.6
Trying to lower total memory consumption so the tests
will pass
 2012-11-12 16:22:05 -07:00
Ryan Schneider
c638617612 Add gzip_compression support to cp.get_file 2012-11-08 16:09:38 -08:00