Commit Graph

3683 Commits

Author SHA1 Message Date
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
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