valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,036 Commits 24 Branches 182 Tags 341 MiB
ba94878f45
Commit Graph

2060 Commits

Author SHA1 Message Date
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
Vincent Desjardins
7e517a6a5a fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-09 22:10:38 -04: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
Colton Myers
8c1fa5358e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/debian_ip.py
	salt/modules/file.py
	salt/states/ssh_auth.py
	salt/utils/cloud.py
 2015-03-09 11:50:21 -06:00
Thomas S Hatch
0da8878b90 lint 2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4 Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests 2015-03-09 11:00:10 -06:00
Tomas Sirny
daf06c1ab6 Credit for test 2015-03-09 09:38:29 +01: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
Viet Hung Nguyen
2a845989b7 bugfix: fix test mode in ssh_known_hosts 
- present func: should not require key/fingerprint.
  In normal mode, key AND fingerprint can be omitted but
  test mode requires them, so fix the test mode to behave same
  way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
 2015-03-07 00:58:32 +07:00
Thomas Jackson
9fa37fd46b Add raw boolean support to depends decorator 2015-03-05 21:59:10 -08:00
rallytime
d9d30cc855 Pylint fix 2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11 Python 3 compat for joyent integration test file 2015-03-04 16:11:45 -07:00
Justin Findlay
cfd03959d5 fix develop lint 2015-03-03 23:28:56 -07:00
Erik Johnson
0a077c14e3 Update test_valid_docs for nspawn compatibility funcs 2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86 Merge pull request #21083 from cachedout/request_test 
Fix error in state.request
 2015-03-03 10:00:14 -07:00
Justin Findlay
a6b86ef627 indent quoted code in cmdmod tests 2015-03-02 16:08:49 -07: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
Erik Johnson
5573b18624 Fix more py3-incompatible print statements 2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14 Lint fix 2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af Merge pull request #21160 from terminalmage/lint-2015.2 
Don't use print statement without parenthesis (py3 compat)
 2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f update test_valid_docs 2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4 Don't use print statement without parenthesis (py3 compat) 
This backports a lint fix from #21158 into the tests for 2015.2.
 2015-02-28 11:41:51 -06:00
C. R. Oldham
1ff3192c20 Fileserver lists return lists 2015-02-27 17:24:25 -07:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Justin Findlay
3397dc5540 fix state request tests 2015-02-27 16:15:26 -07:00
Mike Place
14592ed1f9 Adjust batch test 2015-02-27 14:53:58 -07:00
rallytime
eceadb82b1 Move tearDown functionality into test_instance 
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
 2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6 Add some more tests to catch API changes for digital ocean 2015-02-27 14:53:54 -07:00
Justin Findlay
68f06aae51 add integration test for #18317 2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089 adding cmd.run integration tests 2015-02-27 14:53:53 -07:00
Nicole Thomas
c2ca579906 Merge pull request #20965 from rallytime/joyent_cloud_tests 
Add Joyent cloud provider tests
 2015-02-27 14:42:08 -07:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
Pedro Algarvio
38ddbbc227 Fix imports 2015-02-26 09:41:22 +00:00
Thomas S Hatch
87c6e0cbe9 Merge pull request #21023 from rallytime/bp-19303 
Backport #19303 to 2014.7
 2015-02-25 18:07:00 -07:00
Justin Findlay
581247f4b5 fix ssh test error 
introduced by #21006
 2015-02-25 15:27:03 -07:00
Mike Place
90eb36eba6 Merge pull request #20992 from jfindlay/pub_args 
fix arg preparation for publish module
 2015-02-25 09:39:33 -07:00
Mike Place
011f8c4e72 Adjust batch test 2015-02-25 09:32:03 -07:00
rallytime
e5c4cf8ab4 Move tearDown functionality into test_instance 
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
 2015-02-24 16:42:00 -07:00
rallytime
b2bc55f150 Add some more tests to catch API changes for digital ocean 2015-02-24 16:33:31 -07:00
Justin Findlay
5dace8f688 add integration test for #18317 2015-02-24 16:25:57 -07:00
rallytime
95d4fb801c Skip the ec2 nightly cloud tests for now 
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
 2015-02-24 16:07:23 -07:00
rallytime
e26cac4599 Pylint fix 2015-02-24 10:58:39 -07:00
jfindlay
a38c17efde Merge pull request #20901 from aspyatkin/feature-bower 
Add Bower execution and state modules
 2015-02-23 21:40:10 -07:00
Justin Findlay
5ab5380094 adding cmd.run integration tests 2015-02-23 16:35:07 -07:00
Justin Findlay
ebc6a1f4c8 fix matcher tests for 2015.2->develop merge 2015-02-23 15:39:44 -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
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00: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
jfindlay
ca79845b2f Merge pull request #20848 from rallytime/new_requisites_tests 
Integration tests for the new requisites added in 2014.7
 2015-02-19 18:29:00 -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
0d6663b8a8 conform shell integration tests to txt runner 2015-02-17 15:40:17 -07:00
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
jfindlay
26a0afdf57 Merge pull request #20661 from jacksontj/2015.2 
2015.2
 2015-02-13 08:49:59 -07:00
Thomas Jackson
90dc0ec4ec pylint 2015-02-12 17:06:41 -08:00
Thomas Jackson
c4b9c076e8 Check key types in lazyloader 
Better fix for #20623 and a test case
 2015-02-12 17:06:41 -08:00
Nicole Thomas
f82183d13d Merge pull request #19235 from terminalmage/lxc-refactor 
LXC Refactor
 2015-02-12 17:16:52 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
rallytime
cffbca44b6 Pylint fix - remove unused import 2015-02-11 09:35:04 -07:00
rallytime
533adca23a Merge branch '2014.7' into merge_forward_15 2015-02-11 08:48:14 -07:00
Mike Place
194ad0f8b1 Last time with find removed 2015-02-11 08:45:37 -07:00
jfindlay
a4572f34f3 Merge pull request #20578 from rallytime/bp-20561 
Backport #20561 to 2014.7
 2015-02-10 20:51:23 -07:00
Mike Place
c41998cc4f Remove another test. 2015-02-10 17:12:31 -07:00
Mike Place
836b525779 Disable gitfs test that does not produce valuable data 2015-02-10 17:11:04 -07:00
Mike Place
c5081179ef gitfs test lint fix 2015-02-10 14:57:28 -07:00
Erik Johnson
706ce858b4 Disable LXC integration tests for now 2015-02-10 15:06:47 -06:00
Erik Johnson
f18a23c284 Ignore lack of CLI example in deprecated function 2015-02-10 15:06:47 -06:00
Mike Place
78309a0e2d Last time with find removed 2015-02-10 13:40:33 -07:00
Mike Place
dbd74fbeee Remove another test. 2015-02-10 11:54:16 -07:00
Mike Place
1e14c9d097 Disable gitfs test that does not produce valuable data 2015-02-10 10:06:01 -07:00
Mike Place
c15756b50f Fix loader pylint 2015-02-10 09:14:34 -07:00
Thomas Jackson
cf5157c533 Support arbitrarily deep modules 
Note: salt can still only *call* modules on the first depth, but they can then import anything below
 2015-02-09 17:51:06 -08:00
Thomas Jackson
7ea33b23ce Change modulekey for submodule test-- to avoid namespace collisions 2015-02-09 17:51:05 -08:00
Thomas Jackson
ee69948dc4 pylint 2015-02-09 17:51:05 -08:00
Thomas Jackson
d869ce7e5f Add support for submodules to LazyLoader 
This was a feature that was inadvertently removed in #20274, but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.

This includes the feature as well as tests.
 2015-02-09 17:51:05 -08:00
Mike Place
9b9a546bc9 Merge pull request #20473 from jacksontj/develop 
Add "disabled" support
 2015-02-09 11:09:32 -07:00
Thomas Jackson
438ede78ba Support arbitrarily deep modules 
Note: salt can still only *call* modules on the first depth, but they can then import anything below
 2015-02-07 14:55:30 -08:00
Thomas Jackson
249096c292 Change modulekey for submodule test-- to avoid namespace collisions 2015-02-07 12:02:26 -08:00
Thomas Jackson
7605ba60a8 pylint 2015-02-07 12:02:26 -08:00
Thomas Jackson
ca5eac3936 Add support for submodules to LazyLoader 
This was a feature that was inadvertently removed in #20274, but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.

This includes the feature as well as tests.
 2015-02-07 12:02:26 -08:00
Thomas Jackson
725708a04b Correct tag name in loader tests 2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010 Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274

Conflicts:
	salt/loader.py
 2015-02-07 12:02:03 -08:00
rallytime
15a140ece4 Moved tests/unit/loader.py to tests/integration/loader/loader.py 
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
 2015-02-07 11:59:47 -08:00
Thomas Jackson
fb0d46f445 Pylint 2015-02-07 11:59:03 -08:00
Thomas Jackson
726f8dc2ac Check that __context__ is always present, since it now is (properly) 2015-02-07 11:59:00 -08:00
Thomas Jackson
e1f8ea650f Remove grains outputter 
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working

Conflicts:

	salt/output/grains.py

Conflicts:
	salt/output/grains.py
 2015-02-07 11:57:14 -08:00
Thomas Jackson
02e219e452 Pack modules to runners 2015-02-07 11:54:39 -08:00
jfindlay
4afaccf6b1 Merge pull request #20482 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-06 16:59:27 -07:00
Colton Myers
244c916b10 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/cron.py
	salt/states/npm.py
 2015-02-06 15:41:21 -07:00
Thomas Jackson
07de054b81 Correct tag name in loader tests 2015-02-06 14:26:30 -08:00
Thomas Jackson
4e592f3aae Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274
 2015-02-06 14:26:30 -08:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
rallytime
dd413f495d Move integration import after ensure_in_syspath call 2015-02-06 12:49:28 -07:00
rallytime
e256943fd6 Pylint fix for develop 2015-02-06 10:04:52 -07:00
rallytime
eaa879a64e Python 3 compat for tests/integration/loader/globals.py 2015-02-06 07:48:20 -07:00
rallytime
385792727b Moved tests/unit/loader.py to tests/integration/loader/loader.py 
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
 2015-02-06 07:28:43 -07:00
Thomas Jackson
f01a5c5fbd Pylint 2015-02-05 12:17:48 -08:00
Thomas Jackson
307e5c1473 Check that __context__ is always present, since it now is (properly) 2015-02-05 09:20:30 -08:00
Thomas Jackson
b23a076e11 Remove grains outputter 
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working

Conflicts:

	salt/output/grains.py
 2015-02-05 09:20:29 -08:00
Thomas Jackson
509b4352f2 Pack modules to runners 2015-02-05 09:20:27 -08:00
Justin Findlay
7c943ec8a7 only add successfully generated ssh keys to config 2015-02-04 16:16:41 -07:00
rallytime
759ce02829 Pylint fix for 2015.2 2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7 Typo 2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809 Better detection for minimum pyzmq version 2015-02-02 13:52:26 -07:00
Thomas S Hatch
cefb78efe9 Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize 
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
 2015-01-31 03:13:53 -07:00
rallytime
310e9075bf Pylint disable StrictVersion import error 2015-01-30 17:32:17 -07:00
Mike Place
710bb63103 Typo 2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904 Better detection for minimum pyzmq version 2015-01-30 16:01:59 -07:00
Pedro Algarvio
34c75b1a8d The dictionary changes while iterating. Run over a list of keys. 2015-01-30 22:27:14 +00:00
Pedro Algarvio
ac15f12349 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
ca06f278eb Py3 compatibility fixes. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
5dab3e0d7d Py3 compatibility fixes. 2015-01-30 22:25:29 +00:00
Pedro Algarvio
dc2d3b8ba2 The imports do work! 2015-01-30 22:25:29 +00:00
Pedro Algarvio
788bb913c6 Py3 compatibility fixes. 2015-01-30 22:25:28 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
e6ab1d4ba1 Fix import 2015-01-30 22:25:19 +00:00
Pedro Algarvio
fdd2a3e246 Correct the iteration 2015-01-30 22:25:19 +00:00
Pedro Algarvio
403abc88e1 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
8fa37d65eb Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
eca6f730db Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
4ae7e918e9 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
f5928068b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3624b911b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3f24dcfa80 Import six at a later stage 2015-01-30 22:25:07 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
a4e48e8873 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
2d8b216bcd Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0bc44131e8 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
dd146ca3e5 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
5bc0c157b6 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09 Pass opts not an ImmutableDict of opts 2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Thomas Jackson
4db02487f1 Pass opts not an ImmutableDict of opts 2015-01-27 13:11:01 -08:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
Thomas S Hatch
bf397d12b3 Merge pull request #20094 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-27 10:04:51 -07:00
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -07:00
Mike Place
0b38efaaad Increae default runner timeout to 60s 2015-01-26 10:59:55 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Pedro Algarvio
a6c3915049 Fix order for proper diff on failure 2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7 Merge pull request #19972 from rallytime/bp-19746 
Backport #19746 to 2015.2
 2015-01-22 17:55:27 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state. 
Include integration tests.
 2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d Add comment. 2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-22 14:24:29 -07:00
Mathias Gug
f4c75375f4 Make sure boto_sns state is idempotent. 2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73 Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions 
Conflicts:
	tests/integration/states/boto_sns.py
 2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5 Support subscriptions in sns topic state. 2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2 White-space lint fix 2015-01-21 14:17:03 +00:00
Pedro Algarvio
b0920b226e We still support Python 2.6, so, we need indexes. 2015-01-21 02:11:48 +00:00
Thomas S Hatch
8bfb79c8d9 Merge pull request #19812 from matthew-muscat/develop 
Update hosts file creation for consistency and improved readability
 2015-01-20 14:52:01 -07:00
Thomas S Hatch
1569520a4b Merge pull request #19792 from rallytime/merge_forward_develop 
Merge 2015.2 forward into develop
 2015-01-17 09:39:02 -07:00
Matthew Muscat
f44d67471d Update hosts module test 
Update test case to account for formatting changes in b82001fcd4
 2015-01-18 00:33:00 +11:00
Thomas S Hatch
fab600add9 Merge pull request #19746 from lyft/add-boto-sns-module 
Add boto_sns module and state.
 2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop' 
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
 2015-01-16 11:36:32 -07:00
Mathias Gug
64cf74ebaa Fix style. 2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e Fix style. 2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd Fix style issues. 2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6 Add boto_sns module and state. 
Include integration tests.
 2015-01-14 15:43:06 -08:00
Mathias Gug
97d0f93fd3 Fix coding style. 2015-01-14 13:06:43 -08:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2 
Conflicts:
	salt/modules/archive.py
 2015-01-14 14:26:22 -06:00
Mathias Gug
30625a0437 Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-14 11:49:54 -08:00
Mathias Gug
61eeac5465 Add comment. 2015-01-14 11:12:23 -08:00
Mathias Gug
3ff36a9692 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-14 11:08:54 -08:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07:00
Thomas S Hatch
f1391fb8d9 Merge pull request #19667 from cachedout/ssh_tests 
Fix tests
 2015-01-13 08:14:34 -07:00
Mike Place
fc9a647a3b Remove assert: 2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597 Fix tests 2015-01-12 16:01:10 -07:00
Mike Place
74501f56ae Fix tornado tests 
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
 2015-01-12 15:36:34 -07:00
Thomas S Hatch
c79871e77d Merge pull request #19637 from s0undt3ch/develop 
Merge branch '2015.2' into develop
 2015-01-12 11:33:14 -07:00
Pedro Algarvio
c3bc043b23 Merge branch '2015.2' into develop 
Conflicts:
	salt/syspaths.py
	setup.py
	tests/integration/__init__.py
 2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
Thomas Jackson
e35c7ac313 cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-10 16:32:24 -08:00
Thomas Jackson
d352057f11 Pylint fix 2015-01-10 16:31:59 -08:00
Thomas Jackson
c17462d062 Caste jid as str (its an int all over), and change runner tag to correct prefix 2015-01-10 16:30:00 -08:00
Mike Place
0e935486de Merge pull request #19605 from jacksontj/develop 
Fixes for develop
 2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d Temporarily change this test to work around race condition in the runnerclient 
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
 2015-01-10 00:18:16 -08:00