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
e386db2c34
Update syndic_config test for new cachedir
2015-03-19 11:33:09 -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
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
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
4873382184
Merge pull request #21487 from rallytime/bp-21469
...
Backport #21469 to 2014.7
2015-03-11 15:05:08 -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
Vincent Desjardins
d5293901bc
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-10 09:17:48 -06: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
Justin Findlay
a6b86ef627
indent quoted code in cmdmod tests
2015-03-02 16:08:49 -07:00
Justin Findlay
17b8f73f1b
add cmd module integration tests
2015-02-27 16:30:05 -07: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
Justin Findlay
5ab5380094
adding cmd.run integration tests
2015-02-23 16:35:07 -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
Thomas S Hatch
9e054f3890
Merge pull request #20616 from rallytime/merge-20419
...
Merge #20419 with test syntax fix
2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557
Fix second pylint error that popped up
2015-02-11 22:07:37 -07:00
rallytime
789570fb94
Fix pylint/syntax of test in which_test to merge #20419
2015-02-11 21:48:34 -07:00
Hung Nguyen Viet
d10ce3ade2
fix unittest for windows
2015-02-12 01:37:40 +07:00
rallytime
cffbca44b6
Pylint fix - remove unused import
2015-02-11 09:35:04 -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
Arnold Bechtoldt
9de6c1d839
improve test tests/unit/utils/validate_net_test.py useability
2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db
do call class methods correctly
2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7
fix pep8 lint checks, refs #20508
2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76
fix broken ipv6 address verification in salt.utils.validate.net
2015-02-08 23:48:05 +01:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -07:00
Justin Findlay
8eab04bd69
fix linux_sysctl_test failures caused by #20314
2015-02-03 11:30:27 -07:00
Thomas S Hatch
daba06fac2
Merge pull request #20162 from rallytime/bp-20062
...
Backport #20062 to 2014.7
2015-01-28 15:06:07 -07:00
Thomas S Hatch
0b47a56773
Merge pull request #20000 from terminalmage/fix-19552
...
Better check for pillar for jinja templating
2015-01-28 14:35:56 -07:00
Mike Place
7c066c38a0
Increae default runner timeout to 60s
2015-01-28 13:56:41 -07:00
Thomas S Hatch
d199edde20
Merge pull request #20076 from rallytime/fix_states_file_tests
...
Add some mocked variables to fix the file_test failures
2015-01-26 20:38:53 -07:00
