valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,880 Commits 24 Branches 182 Tags 341 MiB
f9df9fda79
Commit Graph

3757 Commits

Author SHA1 Message Date
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
Mike Place
275993ee18 Include parser option for --no-tests 2015-04-03 15:34:46 -06:00
Nicole Thomas
b23dd2234d Merge pull request #22315 from rahulhan/event_unit_test 
Adding states event.py unit tests
 2015-04-03 06:30:58 -06:00
Nicole Thomas
cd69833731 Merge pull request #22318 from jayeshka/twilio_notify-unit-test 
adding twilio_notify unit test case.
 2015-04-03 06:30:13 -06:00
Rahul Handay
a572f3cadc Adding nova.py unit tests 2015-04-03 14:40:46 +05:30
Jayesh Kariya
57925820ed adding twilio_notify unit test case. 2015-04-03 14:29:49 +05:30
Thayne Harbaugh
c91392bc91 Add option -J/--pillar-pcre to match on pillar PCREs 2015-04-03 02:47:19 -06:00
Rahul Handay
034386e855 Adding states event.py unit tests 2015-04-03 11:24:47 +05:30
Mike Place
5b6075c74c Merge pull request #22287 from jfindlay/debug_rest_tornado_test 
debug rest_tornado test error
 2015-04-02 09:22:14 -06:00
Justin Findlay
a927087f64 debug rest_tornado test error 2015-04-02 09:05:48 -06:00
Justin Findlay
e48df011fa adding alias state unit tests 2015-04-01 22:12: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
Thomas S Hatch
2b77267c4e Merge pull request #22091 from basepi/jinja.cmd.run 
[2015.2] Alias `cmd.run` to `cmd.shell` in templates (python_shell=True)
 2015-03-30 17:00:24 -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
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites 
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
 2015-03-27 21:04:00 -07:00
Colton Myers
c91a593507 Fix test to give more data on failure 2015-03-27 16:50:39 -06:00
Evan Borgstrom
247d38d1da This fixes #21796 
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
 2015-03-21 08:03:12 -07:00
Evan Borgstrom
3223a15f83 This fixes #21796 
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
 2015-03-21 07:58:14 -07:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -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
Colton Myers
e386db2c34 Update syndic_config test for new cachedir 2015-03-19 11:33:09 -06:00
Colton Myers
04b2125581 Update syndic_config test for new cachedir 2015-03-18 15:17:39 -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
Justin Findlay
5f143ecb60 unit tests for states.archive.extracted tar opts 
Implements tests for #20795.
 2015-03-17 20:40:20 -06: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
53c9d48331 fix typo 2015-03-17 19:58:05 -06:00
Justin Findlay
f735f0b96d add eauth pam group tests 
Adds test for #17380.
 2015-03-17 14:25:57 -06:00
Colton Myers
065f573bad Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/master.py
 2015-03-17 13:35:32 -06:00
Alexander Schwartz
5f11f7b74c added tests to ensure commands are created accordingly (without additional single quotes) 2015-03-16 14:49:09 -06:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-03-12 13:36:39 -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
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469 
Backport #21469 to 2014.7
 2015-03-11 15:05:08 -06:00
Mike Place
debc936d29 Re-align test for saltclienterror exception 2015-03-11 13:43:55 -06:00
Ross Perkins
d473408074 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:17 -07:00
Ross Perkins
3f3218d853 Fix for issue #21491 2015-03-11 11:33:39 -07:00
Ross Perkins
8083cf554d Backport of PR #21358 to 2014.7 2015-03-10 09:38:16 -07: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
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 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
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
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07: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
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -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
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
38ddbbc227 Fix imports 2015-02-26 09:41:22 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn." 
This reverts commit 5d35f856ac.
 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
rallytime
565f10959d Add transport key to mocked opts to fix batch unit tests 2015-02-25 13:51:25 -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
Justin Findlay
5ab5380094 adding cmd.run integration tests 2015-02-23 16:35:07 -07:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -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
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
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
jfindlay
59eaabea0a Merge pull request #20688 from rallytime/bp-20125 
Backport #20125 to 2015.2
 2015-02-13 11:46:21 -07:00
Mike Place
d1d52d2245 Avoid file cache problem in pydsl tests 
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
 2015-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
jfindlay
26a0afdf57 Merge pull request #20661 from jacksontj/2015.2 
2015.2
 2015-02-13 08:49:59 -07:00