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
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
rallytime
565f10959d
Add transport key to mocked opts to fix batch unit tests
2015-02-25 13:51:25 -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
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
8eab04bd69
fix linux_sysctl_test failures caused by #20314
2015-02-03 11:30:27 -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
Erik Johnson
59e7481e2b
Fix TestSaltCacheLoader tests
...
Similar fixes as made for TestGetTemplate
2015-01-26 16:04:21 -06:00
rallytime
cdc8039b58
Add some mocked variables to fix the file_test failures
...
Also do a little clean up of states/file.py and salt/state.py
2015-01-26 14:11:56 -07:00
Erik Johnson
d34c0c7787
Fix jinja tests
...
With recent edits to the jinja templating system, file_roots and
pillar_roots are referenced, so they need to be in the mocked opts dict.
2015-01-26 13:10:05 -06:00
Erik Johnson
24752ffe93
Fix archive tests
2015-01-13 22:19:14 -06:00
Thomas S Hatch
31f825d9f2
Merge pull request #19539 from terminalmage/fix-archive-tests
...
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
rallytime
a150447b15
pylint fix
2015-01-08 12:56:09 -07:00
rallytime
6f74048688
Fix blockdev module unit tests
2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332
Update archive tests to use python_shell=False
2015-01-08 13:51:47 -06:00
Thomas S Hatch
1e670f7b3e
Merge pull request #19478 from thatch45/qp_shell
...
shellisms for q and p modules
2015-01-08 11:54:44 -07:00
Colton Myers
f31128bcc6
Merge pull request #19492 from basepi/shell01
...
Set python_shell=false
2015-01-08 11:45:29 -07:00
Colton Myers
522467f546
Fix gem failure
2015-01-08 10:42:55 -07:00
Thomas S Hatch
792b0ba9c6
added the shell call to too many tests
2015-01-08 10:13:50 -07:00
Erik Johnson
5edba8e55e
Add back double-quote
...
This is in the actual dig output, I shouldn't have removed it.
2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338
Fix dig tests
...
This fixes the dig tests after dig.py was modified to use
python_shell=False.
2015-01-07 19:59:16 -06:00
Thomas S Hatch
0e1683672f
first round of pip test updates
2015-01-07 14:54:36 -07:00
Justin Findlay
d8785de0fd
fix uwsgi test
2015-01-07 11:57:44 -07:00
Nicole Thomas
83e451d392
Merge pull request #19401 from rallytime/test_fixes
...
Pylint and psutil unit test fixes for 2014.7 branch
2015-01-06 13:24:15 -07:00
rallytime
c105867720
namedtuple doesn't exist in psutil._compat in psutil 2.2.0
2015-01-06 12:08:31 -07:00
Mike Place
88f3477772
These were unused and causing weird recursion errors in unit tests
2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f
Pylint fix for 2014.7 branch
2015-01-06 11:14:06 -07:00
Thomas S Hatch
41bef7771e
Merge pull request #19356 from rallytime/bp-19340
...
Backport #19340 to 2014.7
2015-01-06 10:17:49 -07:00
Nitin Madhok
f20f899b34
Changing return to match zpool list instead of zfs list
2015-01-05 14:05:55 -07:00
nmadhok
44454a3687
Replacing zfs with zpool
2015-01-05 14:05:55 -07:00
nmadhok
8670e399ce
Adding unit tests for salt.modules.zpool
2015-01-05 14:05:55 -07:00
Mike Place
0194fbe77c
Attempt to fix inconsintent VT test by preventing a spin
2015-01-05 13:35:02 -07:00
Nitin Madhok
9f601484bf
Fixing unit tests for mdadm
2014-12-23 11:31:58 -07:00
